From 0d6283918f3f7cb0ab25111a978b9c09fb5cbca6 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 13 May 2011 10:05:38 +0000 Subject: fix a broken cached response if bypass/no_cache directive values are different, the bug has been introduced in r3700 --- src/http/ngx_http_file_cache.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/http/ngx_http_file_cache.c') diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c index fb1ab9854..03cd268b2 100644 --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -174,8 +174,6 @@ ngx_http_file_cache_create(ngx_http_request_t *r) ngx_pool_cleanup_t *cln; ngx_http_file_cache_t *cache; - ngx_http_file_cache_create_key(r); - c = r->cache; cache = c->file_cache; @@ -906,7 +904,7 @@ ngx_http_file_cache_free(ngx_http_cache_t *c, ngx_temp_file_t *tf) ngx_http_file_cache_t *cache; ngx_http_file_cache_node_t *fcn; - if (c->updated) { + if (c->updated || c->node == NULL) { return; } -- cgit