From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 27 Jul 2010 11:22:59 +0000 (+0000)
Subject: fix r3695: this commit
X-Git-Tag: release-0.8.47~7
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=4b7637adb6a9dee317c771fdf122ccc1af324d8c;p=nginx.git

fix r3695: this commit
*) freed valid keys zone node
*) and did not decrease cache size, so cache manager process ete CPU time,
   if cache checking max_size was enabled
---

diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 4dc2b5741..ad97f0787 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_request_t *r, ngx_temp_file_t *tf)
         fcn->valid_msec = c->valid_msec;
         fcn->error = c->error;
 
-    } else if (fcn->valid_msec == 0 && fcn->count == 0) {
+    } else if (fcn->valid_sec == 0 && fcn->count == 0) {
         ngx_queue_remove(&fcn->queue);
         ngx_rbtree_delete(&cache->sh->rbtree, &fcn->node);
         ngx_slab_free_locked(cache->shpool, fcn);