Mercurial > hg > nginx

changeset 3743:c469ffeab569

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error status codes could be cached for next request only, the bug has been introduced in r3712
author Igor Sysoev <igor@sysoev.ru>
date Wed, 04 Aug 2010 12:55:27 +0000
parents 01691af60f94
children 77b18d36d123
files src/http/ngx_http_file_cache.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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_
     }
 
     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);