Skip to content

Commit

Permalink
Cache: send conditional requests only for cached 200/206 responses.
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
PiotrSikora committed Nov 27, 2014
1 parent cf5013d commit 1ea64b3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/http/ngx_http_file_cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ ngx_http_file_cache_new(ngx_http_request_t *r)
c->file.log = r->connection->log;
c->file.fd = NGX_INVALID_FILE;

c->last_modified = -1;

return NGX_OK;
}

Expand Down
11 changes: 8 additions & 3 deletions src/http/ngx_http_upstream.c
Original file line number Diff line number Diff line change
Expand Up @@ -2565,12 +2565,17 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
}

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);
Expand Down

0 comments on commit 1ea64b3

Please sign in to comment.