Mercurial > hg > nginx
changeset 5935:1573fc7875fa
Cache: send conditional requests only for cached 200/206 responses.
RFC7232 says:
The 304 (Not Modified) status code indicates that a conditional GET
or HEAD request has been received and would have resulted in a 200
(OK) response if it were not for the fact that the condition
evaluated to false.
which means that there is no reason to send requests with "If-None-Match"
and/or "If-Modified-Since" headers for responses cached with other status
codes.
Also, sending conditional requests for responses cached with other status
codes could result in a strange behavior, e.g. upstream server returning
304 Not Modified for cached 404 Not Found responses, etc.
Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
author | Piotr Sikora <piotr@cloudflare.com> |
---|---|
date | Wed, 26 Nov 2014 18:35:37 -0800 |
parents | 2c33ed82cde1 |
children | 2d3908516101 |
files | src/http/ngx_http_file_cache.c src/http/ngx_http_upstream.c |
diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_file_cache.c Mon Aug 04 11:03:20 2014 +0400 +++ b/src/http/ngx_http_file_cache.c Wed Nov 26 18:35:37 2014 -0800 @@ -177,6 +177,8 @@ c->file.log = r->connection->log; c->file.fd = NGX_INVALID_FILE; + c->last_modified = -1; + return NGX_OK; }
--- a/src/http/ngx_http_upstream.c Mon Aug 04 11:03:20 2014 +0400 +++ b/src/http/ngx_http_upstream.c Wed Nov 26 18:35:37 2014 -0800 @@ -2565,12 +2565,17 @@ } if (valid) { - r->cache->last_modified = u->headers_in.last_modified_time; r->cache->date = now; r->cache->body_start = (u_short) (u->buffer.pos - u->buffer.start); - if (u->headers_in.etag) { - r->cache->etag = u->headers_in.etag->value; + if (u->headers_in.status_n == NGX_HTTP_OK + || u->headers_in.status_n == NGX_HTTP_PARTIAL_CONTENT) + { + r->cache->last_modified = u->headers_in.last_modified_time; + + if (u->headers_in.etag) { + r->cache->etag = u->headers_in.etag->value; + } } ngx_http_file_cache_set_header(r, u->buffer.start);