commit 81b43370d5be40d490e1969742b5ac070249613a
author Maxim Dounin <mdounin@mdounin.ru> Mon Oct 17 17:30:18 2011 +0000
committer Maxim Dounin <mdounin@mdounin.ru> Mon Oct 17 17:30:18 2011 +0000
tree 055e4a2ccc41210cc72c94c8ebf944f8603b7a49
parent 249d72b7fb7c6a5ed39d8c023d46436708fd29b1

Fixed "expires @00h".

src/http/modules/ngx_http_headers_filter_module.c

diff --git a/src/http/modules/ngx_http_headers_filter_module.c b/src/http/modules/ngx_http_headers_filter_module.c
index c3f74ae..8524450 100644
--- a/src/http/modules/ngx_http_headers_filter_module.c
+++ b/src/http/modules/ngx_http_headers_filter_module.c
@@ -253,7 +253,7 @@
         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");