Mercurial > hg > nginx

changeset 4298:186f02886bed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: don't cache unfinished responses. Check if received data length match Content-Length header (if present), don't cache response if no match found. This prevents caching of corrupted response in case of premature connection close by upstream.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 18 Nov 2011 15:09:08 +0000
parents 2f8e9469b436
children 11e47bf300db
files src/http/ngx_http_upstream.c
diffstat 1 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2696,9 +2696,17 @@ ngx_http_upstream_process_request(ngx_ht
 
             } else if (p->upstream_eof) {
 
-                /* TODO: check length & update cache */
-
-                ngx_http_file_cache_update(r, u->pipe->temp_file);
+                tf = u->pipe->temp_file;
+
+                if (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);
+
+                } else {
+                    ngx_http_file_cache_free(r->cache, tf);
+                }
 
             } else if (p->upstream_error) {
                 ngx_http_file_cache_free(r->cache, u->pipe->temp_file);