Mercurial > hg > nginx

changeset 4216:ecf4608c2783

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed "expires @00h".
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 17 Oct 2011 17:30:18 +0000
parents c80916f29756
children ebec73b935d3
files src/http/modules/ngx_http_headers_filter_module.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_headers_filter_module.c
+++ b/src/http/modules/ngx_http_headers_filter_module.c
@@ -253,7 +253,7 @@ ngx_http_set_expires(ngx_http_request_t 
         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");