From 24e38323ee2cf7b3c0f2f23e2b629aed57ecac42 Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Wed, 23 Mar 2016 14:16:31 +0300 Subject: [PATCH] Cache: fixed slots accounting error introduced in c9d680b00744. --- src/http/ngx_http_file_cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c index 63ce6bb21..3561028f0 100644 --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -2115,12 +2115,12 @@ ngx_http_file_cache_add(ngx_http_file_cache_t *cache, ngx_http_cache_t *c) "could not allocate node%s", cache->shpool->log_ctx); } - cache->sh->count++; - ngx_shmtx_unlock(&cache->shpool->mutex); return NGX_ERROR; } + cache->sh->count++; + ngx_memcpy((u_char *) &fcn->node.key, c->key, sizeof(ngx_rbtree_key_t)); ngx_memcpy(fcn->key, &c->key[sizeof(ngx_rbtree_key_t)],