Mercurial > hg > nginx
comparison src/http/modules/ngx_http_headers_filter_module.c @ 4216:ecf4608c2783
Fixed "expires @00h".
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 17 Oct 2011 17:30:18 +0000 |
parents | 59b99f217c6d |
children | ebec73b935d3 |
comparison
equal
deleted
inserted
replaced
4215:c80916f29756 | 4216:ecf4608c2783 |
---|---|
251 expires->value.data = ngx_pnalloc(r->pool, len); | 251 expires->value.data = ngx_pnalloc(r->pool, len); |
252 if (expires->value.data == NULL) { | 252 if (expires->value.data == NULL) { |
253 return NGX_ERROR; | 253 return NGX_ERROR; |
254 } | 254 } |
255 | 255 |
256 if (conf->expires_time == 0) { | 256 if (conf->expires_time == 0 && conf->expires != NGX_HTTP_EXPIRES_DAILY) { |
257 ngx_memcpy(expires->value.data, ngx_cached_http_time.data, | 257 ngx_memcpy(expires->value.data, ngx_cached_http_time.data, |
258 ngx_cached_http_time.len + 1); | 258 ngx_cached_http_time.len + 1); |
259 ngx_str_set(&cc->value, "max-age=0"); | 259 ngx_str_set(&cc->value, "max-age=0"); |
260 return NGX_OK; | 260 return NGX_OK; |
261 } | 261 } |