]> git.kaiwu.me - nginx.git/commitdiff
Upstream: don't cache unfinished responses.
authorMaxim Dounin <mdounin@mdounin.ru>
Fri, 18 Nov 2011 15:09:08 +0000 (15:09 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Fri, 18 Nov 2011 15:09:08 +0000 (15:09 +0000)
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.

src/http/ngx_http_upstream.c

index 3645d3bd49b58d29ecd7ce3490279830a0b3ff17..25b6de2e8e81b008ef4616bb77027dd1cee306d1 100644 (file)
@@ -2696,9 +2696,17 @@ ngx_http_upstream_process_request(ngx_http_request_t *r)
 
             } else if (p->upstream_eof) {
 
-                /* TODO: check length & update cache */
+                tf = u->pipe->temp_file;
 
-                ngx_http_file_cache_update(r, 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);