From: Igor Sysoev <igor@sysoev.ru>
Date: Wed, 4 Aug 2010 12:55:27 +0000 (+0000)
Subject: error status codes could be cached for next request only,
X-Git-Tag: release-0.8.49~3
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=2b74841a4f8301e7b3d3af91d220240a3c6e5d34;p=nginx.git

error status codes could be cached for next request only,
the bug has been introduced in r3712
---

diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 94ddbf697..c9ecdedb5 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -927,10 +927,13 @@ ngx_http_file_cache_free(ngx_http_cache_t *c, ngx_temp_file_t *tf)
     }
 
     if (c->error) {
-        fcn->valid_sec = c->valid_sec;
-        fcn->valid_msec = c->valid_msec;
         fcn->error = c->error;
 
+        if (c->valid_sec) {
+            fcn->valid_sec = c->valid_sec;
+            fcn->valid_msec = c->valid_msec;
+        }
+
     } else if (!fcn->exists && fcn->count == 0 && c->min_uses == 1) {
         ngx_queue_remove(&fcn->queue);
         ngx_rbtree_delete(&cache->sh->rbtree, &fcn->node);