mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-06 17:02:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cache: reduced diffs to the plus version of nginx.

Browse Source 
No functional changes.
This commit is contained in:
Ruslan Ermilov 2015-02-17 16:27:52 +03:00
parent 6337c1d185
commit a4ce770a89
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/http/ngx_http_file_cache.c
View File

@ -258,7 +258,7 @@ ngx_int_t
ngx_http_file_cache_open(ngx_http_request_t *r) ngx_http_file_cache_open(ngx_http_request_t *r)
{ {
ngx_int_t rc, rv; ngx_int_t rc, rv;
ngx_uint_t cold, test; ngx_uint_t test;
ngx_http_cache_t *c; ngx_http_cache_t *c;
ngx_pool_cleanup_t *cln; ngx_pool_cleanup_t *cln;
ngx_open_file_info_t of; ngx_open_file_info_t of;
@ -300,8 +300,6 @@ ngx_http_file_cache_open(ngx_http_request_t *r)
return NGX_HTTP_CACHE_SCARCE; return NGX_HTTP_CACHE_SCARCE;
} }
cold = cache->sh->cold;
if (rc == NGX_OK) { if (rc == NGX_OK) {
if (c->error) { if (c->error) {
@ -314,18 +312,18 @@ ngx_http_file_cache_open(ngx_http_request_t *r)
} else { /* rc == NGX_DECLINED */ } else { /* rc == NGX_DECLINED */
test = cache->sh->cold ? 1 : 0;
if (c->min_uses > 1) { if (c->min_uses > 1) {
if (!cold) { if (!test) {
return NGX_HTTP_CACHE_SCARCE; return NGX_HTTP_CACHE_SCARCE;
} }
test = 1;
rv = NGX_HTTP_CACHE_SCARCE; rv = NGX_HTTP_CACHE_SCARCE;
} else { } else {
c->temp_file = 1; c->temp_file = 1;
test = cold ? 1 : 0;
rv = NGX_DECLINED; rv = NGX_DECLINED;
} }
} }