Mercurial > hg > nginx

changeset 3405:6cc74c87c656

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix negative time in "Cache-Control" if "expires modified" sets time in the past
author Igor Sysoev <igor@sysoev.ru>
date Fri, 25 Dec 2009 15:00:08 +0000
parents 2c07eba97f43
children a2a5812cf4f4
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
@@ -291,7 +291,7 @@ ngx_http_set_expires(ngx_http_request_t 
 
     ngx_http_time(expires->value.data, expires_time);
 
-    if (conf->expires_time < 0) {
+    if (conf->expires_time < 0 || max_age < 0) {
         cc->value.len = sizeof("no-cache") - 1;
         cc->value.data = (u_char *) "no-cache";