diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-07-25 14:56:59 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-07-25 14:56:59 +0400 |
| commit | 187f3948ed4de1e8886fd50cbe937816c25dede6 (patch) | |
| tree | 95dd6555aabcb14a057ff1c150124725b64a64ed | |
| parent | eafe44ff7995ab32c7935495ce0905530a104ec9 (diff) | |
| download | nginx-187f3948ed4de1e8886fd50cbe937816c25dede6.tar.gz nginx-187f3948ed4de1e8886fd50cbe937816c25dede6.tar.bz2 | |
Upstream: fixed store/cache of unfinished responses.
In case of upstream eof, only responses with u->pipe->length == -1
are now cached/stored. This ensures that unfinished chunked responses
are not cached.
Note well - previously used checks for u->headers_in.content_length_n are
preserved. This provides an additional level of protection if protol data
disagree with Content-Length header provided (e.g., a FastCGI response
is sent with wrong Content-Length, or an incomple SCGI or uwsgi response),
as well as protects from storing of responses to HEAD requests. This should
be reconsidered if we'll consider caching of responses to HEAD requests.
| -rw-r--r-- | src/http/ngx_http_upstream.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 210f3bbc1..08c4e5781 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -2985,6 +2985,7 @@ ngx_http_upstream_process_request(ngx_http_request_t *r) tf = p->temp_file; if (u->headers_in.status_n == NGX_HTTP_OK + && (p->upstream_done || p->length == -1) && (u->headers_in.content_length_n == -1 || u->headers_in.content_length_n == tf->offset)) { @@ -3005,9 +3006,10 @@ ngx_http_upstream_process_request(ngx_http_request_t *r) tf = p->temp_file; - if (u->headers_in.content_length_n == -1 - || u->headers_in.content_length_n - == tf->offset - (off_t) r->cache->body_start) + if (p->length == -1 + && (u->headers_in.content_length_n == -1 + || u->headers_in.content_length_n + == tf->offset - (off_t) r->cache->body_start)) { ngx_http_file_cache_update(r, tf); |