merge r3406:

fix negative time in "Cache-Control" if "expires modified" sets time in the past
This commit is contained in:
Igor Sysoev 2010-02-01 15:56:45 +00:00
parent 6eb6500651
commit d13451937a
1 changed files with 1 additions and 1 deletions

View File

@ -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";