Mercurial > hg > nginx
changeset 3443:14b70eb95c53 stable-0.7
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 Mon Feb 01 15:55:48 2010 +0000 +++ b/src/http/modules/ngx_http_headers_filter_module.c Mon Feb 01 15:56:45 2010 +0000 @@ -291,7 +291,7 @@ 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";