From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 1 Feb 2010 15:56:45 +0000 (+0000)
Subject: merge r3406:
X-Git-Tag: release-0.7.65~1
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=d0abd9e4f8349163721f5110091e18f3e4f7c2e6;p=nginx.git

merge r3406:

fix negative time in "Cache-Control" if "expires modified" sets time in the past
---

diff --git a/src/http/modules/ngx_http_headers_filter_module.c b/src/http/modules/ngx_http_headers_filter_module.c
index 3b5ebd68f..fb6c0050e 100644
--- 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 *r, ngx_http_headers_conf_t *conf)
 
     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";