]> git.kaiwu.me - nginx.git/commitdiff
Fixed "expires @00h".
authorMaxim Dounin <mdounin@mdounin.ru>
Mon, 17 Oct 2011 17:30:18 +0000 (17:30 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Mon, 17 Oct 2011 17:30:18 +0000 (17:30 +0000)
src/http/modules/ngx_http_headers_filter_module.c

index c3f74ae19b1e3c737c7c44732ae0221f536788d7..8524450698f66c5447e1d45441fd48386b76d168 100644 (file)
@@ -253,7 +253,7 @@ ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
         return NGX_ERROR;
     }
 
-    if (conf->expires_time == 0) {
+    if (conf->expires_time == 0 && conf->expires != NGX_HTTP_EXPIRES_DAILY) {
         ngx_memcpy(expires->value.data, ngx_cached_http_time.data,
                    ngx_cached_http_time.len + 1);
         ngx_str_set(&cc->value, "max-age=0");