Mercurial > hg > nginx

comparison src/http/modules/ngx_http_headers_filter_module.c @ 4217:ebec73b935d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed "expires @time" with unknown last modified time (ticket #32).
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 17 Oct 2011 17:32:08 +0000
parents ecf4608c2783
children 4a07bad0e2c5
comparison
equal deleted inserted replaced
4216:ecf4608c2783 4217:ebec73b935d3
260 return NGX_OK; 260 return NGX_OK;
261 } 261 }
262 262
263 now = ngx_time(); 263 now = ngx_time();
264 264
265 if (conf->expires == NGX_HTTP_EXPIRES_ACCESS 265 if (conf->expires == NGX_HTTP_EXPIRES_DAILY) {
266 || r->headers_out.last_modified_time == -1) 266 expires_time = ngx_next_time(conf->expires_time);
267 max_age = expires_time - now;
268
269 } else if (conf->expires == NGX_HTTP_EXPIRES_ACCESS
270 || r->headers_out.last_modified_time == -1)
267 { 271 {
268 expires_time = now + conf->expires_time; 272 expires_time = now + conf->expires_time;
269 max_age = conf->expires_time; 273 max_age = conf->expires_time;
270
271 } else if (conf->expires == NGX_HTTP_EXPIRES_DAILY) {
272 expires_time = ngx_next_time(conf->expires_time);
273 max_age = expires_time - now;
274 274
275 } else { 275 } else {
276 expires_time = r->headers_out.last_modified_time + conf->expires_time; 276 expires_time = r->headers_out.last_modified_time + conf->expires_time;
277 max_age = expires_time - now; 277 max_age = expires_time - now;
278 } 278 }