aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http_file_cache.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-05-13 10:05:38 +0000
committerIgor Sysoev <igor@sysoev.ru>2011-05-13 10:05:38 +0000
commit0d6283918f3f7cb0ab25111a978b9c09fb5cbca6 (patch)
tree670ce508e9a519687da50b063f7559433810aa49 /src/http/ngx_http_file_cache.c
parent768f7a05d21be55967955b401a9716082604a0ee (diff)
downloadnginx-0d6283918f3f7cb0ab25111a978b9c09fb5cbca6.tar.gz
nginx-0d6283918f3f7cb0ab25111a978b9c09fb5cbca6.zip
fix a broken cached response if bypass/no_cache directive values are different,
the bug has been introduced in r3700
Diffstat (limited to 'src/http/ngx_http_file_cache.c')
-rw-r--r--src/http/ngx_http_file_cache.c4
1 files changed, 1 insertions, 3 deletions
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;
}