# HG changeset patch # User Igor Sysoev # Date 1311523806 0 # Node ID 9c425f22ea36eb12c222473e85e7738c0e3e7120 # Parent 90b0487fba44f78dd1800acb35e77a07190fd187 fuse two if's in one condition diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -530,7 +530,7 @@ ngx_http_file_cache_exists(ngx_http_file goto done; } - if (fcn->exists) { + if (fcn->exists || fcn->uses >= c->min_uses) { c->exists = fcn->exists; c->body_start = fcn->body_start; @@ -540,16 +540,7 @@ ngx_http_file_cache_exists(ngx_http_file goto done; } - if (fcn->uses >= c->min_uses) { - - c->exists = fcn->exists; - c->body_start = fcn->body_start; - - rc = NGX_OK; - - } else { - rc = NGX_AGAIN; - } + rc = NGX_AGAIN; goto done; }