From 17dad56e4ed2e6db5d3b2559a355a0819f72e501 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Wed, 30 Apr 2014 19:16:35 +0400 Subject: [PATCH] Cache: added ngx_quit check to ngx_http_file_cache_expire(). While managing big caches it is possible that expiring old cache items in ngx_http_file_cache_expire() will take a while. Added a check for ngx_quit / ngx_terminate to make sure cache manager can be terminated while in ngx_http_file_cache_expire(). --- src/http/ngx_http_file_cache.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c index 9e6be1584..49abdb400 100644 --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -1313,6 +1313,11 @@ ngx_http_file_cache_expire(ngx_http_file_cache_t *cache) for ( ;; ) { + if (ngx_quit || ngx_terminate) { + wait = 1; + break; + } + if (ngx_queue_empty(&cache->sh->queue)) { wait = 10; break;