diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2011-10-17 17:30:18 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-10-17 17:30:18 +0000 |
| commit | 81b43370d5be40d490e1969742b5ac070249613a (patch) | |
| tree | 055e4a2ccc41210cc72c94c8ebf944f8603b7a49 /src | |
| parent | 249d72b7fb7c6a5ed39d8c023d46436708fd29b1 (diff) | |
| download | nginx-81b43370d5be40d490e1969742b5ac070249613a.tar.gz nginx-81b43370d5be40d490e1969742b5ac070249613a.zip | |
Fixed "expires @00h".
Diffstat (limited to 'src')
| -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 c3f74ae19..852445069 100644 --- a/src/http/modules/ngx_http_headers_filter_module.c +++ b/src/http/modules/ngx_http_headers_filter_module.c @@ -253,7 +253,7 @@ ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf) return NGX_ERROR; } - if (conf->expires_time == 0) { + if (conf->expires_time == 0 && conf->expires != NGX_HTTP_EXPIRES_DAILY) { ngx_memcpy(expires->value.data, ngx_cached_http_time.data, ngx_cached_http_time.len + 1); ngx_str_set(&cc->value, "max-age=0"); |