Mercurial > hg > nginx-ranges

comparison src/http/modules/ngx_http_headers_filter_module.c @ 578:f3a9e57d2e17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Mar 2010 21:27:17 +0300
parents daf4847b43ff
children 8246d8a2c2be
comparison
equal deleted inserted replaced
539:5f4de8cf0d9d 578:f3a9e57d2e17
289 max_age = expires_time - now; 289 max_age = expires_time - now;
290 } 290 }
291 291
292 ngx_http_time(expires->value.data, expires_time); 292 ngx_http_time(expires->value.data, expires_time);
293 293
294 if (conf->expires_time < 0) { 294 if (conf->expires_time < 0 || max_age < 0) {
295 cc->value.len = sizeof("no-cache") - 1; 295 cc->value.len = sizeof("no-cache") - 1;
296 cc->value.data = (u_char *) "no-cache"; 296 cc->value.data = (u_char *) "no-cache";
297 297
298 return NGX_OK; 298 return NGX_OK;
299 } 299 }