details: http://hg.nginx.org/nginx/rev/3f568dd68af1
branches:
changeset: 5984:3f568dd68af1
user: Ruslan Ermilov <ru@nginx.com>
date: Tue Feb 17 16:27:52 2015 +0300
description:
Cache: reduced diffs to the plus version of nginx.

No functional changes.

diffstat:

src/http/ngx_http_file_cache.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r 69c4912066a4 -r 3f568dd68af1 src/http/ngx_http_file_cache.c
--- a/src/http/ngx_http_file_cache.c Tue Feb 17 14:26:44 2015 +0300
+++ b/src/http/ngx_http_file_cache.c Tue Feb 17 16:27:52 2015 +0300
@@ -258,7 +258,7 @@ ngx_int_t
ngx_http_file_cache_open(ngx_http_request_t *r)
{
ngx_int_t rc, rv;
- ngx_uint_t cold, test;
+ ngx_uint_t test;
ngx_http_cache_t *c;
ngx_pool_cleanup_t *cln;
ngx_open_file_info_t of;
@@ -300,8 +300,6 @@ ngx_http_file_cache_open(ngx_http_reques
return NGX_HTTP_CACHE_SCARCE;
}

- cold = cache->sh->cold;
-
if (rc == NGX_OK) {

if (c->error) {
@@ -314,18 +312,18 @@ ngx_http_file_cache_open(ngx_http_reques

} else { /* rc == NGX_DECLINED */

+ test = cache->sh->cold ? 1 : 0;
+
if (c->min_uses > 1) {

- if (!cold) {
+ if (!test) {
return NGX_HTTP_CACHE_SCARCE;
}

- test = 1;
rv = NGX_HTTP_CACHE_SCARCE;

} else {
c->temp_file = 1;
- test = cold ? 1 : 0;
rv = NGX_DECLINED;
}
}

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel