diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 15:56:45 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 15:56:45 +0000 |
| commit | d0abd9e4f8349163721f5110091e18f3e4f7c2e6 (patch) | |
| tree | b419840f6d9c63c3199d7d71e633da529da79f1e | |
| parent | c76fa1de09e17768ba015b02c17c441cb3e921dd (diff) | |
| download | nginx-d0abd9e4f8349163721f5110091e18f3e4f7c2e6.tar.gz | |
merge r3406:
fix negative time in "Cache-Control" if "expires modified" sets time in the past
| -rw-r--r-- | src/http/modules/ngx_http_headers_filter_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"; |