diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2011-11-18 15:09:08 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-11-18 15:09:08 +0000 |
| commit | e0c1a63028d1c1371f99b6449e4d1ba9d40873a9 (patch) | |
| tree | 06174bc210ad8750a92490918592b3bbd16fb3ed /src | |
| parent | 5eef168a2222b26cdf6dfd2e7c11cb5423cebc74 (diff) | |
| download | nginx-e0c1a63028d1c1371f99b6449e4d1ba9d40873a9.tar.gz nginx-e0c1a63028d1c1371f99b6449e4d1ba9d40873a9.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 3645d3bd4..25b6de2e8 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -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); |