From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 30 Jul 2010 10:20:08 +0000 (+0000)
Subject: do not free unused cache node if cache min_uses > 1,
X-Git-Tag: release-0.8.48~15
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=09ce1e2d89b9925a101dbe0b11a64a66a74497c4;p=nginx.git

do not free unused cache node if cache min_uses > 1,
the bug has been introduced in r3695, r3708, r3711
---

diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 133a52e68..4d8473425 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -932,7 +932,7 @@ ngx_http_file_cache_free(ngx_http_cache_t *c, ngx_temp_file_t *tf)
         fcn->valid_msec = c->valid_msec;
         fcn->error = c->error;
 
-    } else if (!fcn->exists && fcn->count == 0) {
+    } else if (!fcn->exists && fcn->count == 0 && c->min_uses == 1) {
         ngx_queue_remove(&fcn->queue);
         ngx_rbtree_delete(&cache->sh->rbtree, &fcn->node);
         ngx_slab_free_locked(cache->shpool, fcn);