comparison src/http/ngx_http_file_cache.c @ 3743:c469ffeab569

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 a47f431b27a6
children 77b18d36d123
comparison
equal deleted inserted replaced
3742:01691af60f94 3743:c469ffeab569
925 if (c->updating) { 925 if (c->updating) {
926 fcn->updating = 0; 926 fcn->updating = 0;
927 } 927 }
928 928
929 if (c->error) { 929 if (c->error) {
930 fcn->valid_sec = c->valid_sec;
931 fcn->valid_msec = c->valid_msec;
932 fcn->error = c->error; 930 fcn->error = c->error;
931
932 if (c->valid_sec) {
933 fcn->valid_sec = c->valid_sec;
934 fcn->valid_msec = c->valid_msec;
935 }
933 936
934 } else if (!fcn->exists && fcn->count == 0 && c->min_uses == 1) { 937 } else if (!fcn->exists && fcn->count == 0 && c->min_uses == 1) {
935 ngx_queue_remove(&fcn->queue); 938 ngx_queue_remove(&fcn->queue);
936 ngx_rbtree_delete(&cache->sh->rbtree, &fcn->node); 939 ngx_rbtree_delete(&cache->sh->rbtree, &fcn->node);
937 ngx_slab_free_locked(cache->shpool, fcn); 940 ngx_slab_free_locked(cache->shpool, fcn);