diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2022-02-14 10:14:07 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2022-02-14 10:14:07 +0300 |
| commit | a767450093200c76dba8851a9453f13296dd6371 (patch) | |
| tree | d8defe592e6ce44e1dd79ebbd6915bc215855403 /src/http/ngx_http_file_cache.c | |
| parent | 45a8ca0e7a1ae7ec4f7769919e9f3e007113d5ad (diff) | |
| parent | 828fb94e1dbe1c433edd39147ba085c4622c99ed (diff) | |
| download | nginx-a767450093200c76dba8851a9453f13296dd6371.tar.gz nginx-a767450093200c76dba8851a9453f13296dd6371.zip | |
Merged with the default branch.
Diffstat (limited to 'src/http/ngx_http_file_cache.c')
| -rw-r--r-- | src/http/ngx_http_file_cache.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c index c40093bca..4d2f6c42c 100644 --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -1756,6 +1756,11 @@ ngx_http_file_cache_forced_expire(ngx_http_file_cache_t *cache) break; } + if (fcn->deleting) { + wait = 1; + break; + } + p = ngx_hex_dump(key, (u_char *) &fcn->node.key, sizeof(ngx_rbtree_key_t)); len = NGX_HTTP_CACHE_KEY_LEN - sizeof(ngx_rbtree_key_t); |