Mercurial > hg > nginx

changeset 3443:14b70eb95c53 stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r3406: fix negative time in "Cache-Control" if "expires modified" sets time in the past
author Igor Sysoev <igor@sysoev.ru>
date Mon, 01 Feb 2010 15:56:45 +0000
parents f419516d8e6e
children 92247d9294ed
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";