Mercurial > hg > nginx-vendor-0-8
diff src/http/ngx_http_file_cache.c @ 478:f2c6a7373274 NGINX_0_7_51
nginx 0.7.51
*) Feature: the "try_files" directive supports a response code in the
fallback parameter.
*) Feature: now any response code can be used in the "return" directive.
*) Bugfix: the "error_page" directive made an external redirect without
query string; the bug had appeared in 0.7.44.
*) Bugfix: if servers listened on several defined explicitly addresses,
then virtual servers might not work; the bug had appeared in 0.7.39.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Sun, 12 Apr 2009 00:00:00 +0400 |
parents | 09f0ef15d544 |
children | 549994537f15 |
line wrap: on
line diff
--- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -417,7 +417,7 @@ ngx_http_file_cache_exists(ngx_http_file if (fcn == NULL) { ngx_shmtx_unlock(&cache->shpool->mutex); - ngx_http_file_cache_forced_expire(cache); + (void) ngx_http_file_cache_forced_expire(cache); ngx_shmtx_lock(&cache->shpool->mutex); @@ -818,12 +818,12 @@ ngx_http_file_cache_forced_expire(ngx_ht name = ngx_alloc(len + 1, ngx_cycle->log); if (name == NULL) { - return 60; + return 10; } ngx_memcpy(name, path->name.data, path->name.len); - wait = 60; + wait = 10; tries = 0; ngx_shmtx_lock(&cache->shpool->mutex); @@ -891,7 +891,7 @@ ngx_http_file_cache_expire(ngx_http_file name = ngx_alloc(len + 1, ngx_cycle->log); if (name == NULL) { - return 60; + return 10; } ngx_memcpy(name, path->name.data, path->name.len); @@ -903,7 +903,7 @@ ngx_http_file_cache_expire(ngx_http_file for ( ;; ) { if (ngx_queue_empty(cache->queue)) { - wait = 60; + wait = 10; break; } @@ -914,7 +914,7 @@ ngx_http_file_cache_expire(ngx_http_file wait = fcn->expire - now; if (wait > 0) { - wait = wait > 60 ? 60 : wait; + wait = wait > 10 ? 10 : wait; break; } @@ -1042,7 +1042,7 @@ ngx_http_file_cache_manager(void *data) cache->files = 0; if (ngx_walk_tree(&tree, &cache->path->name) == NGX_ABORT) { - return 60; + return 10; } *cache->cold = 0;