From 06ff11798612f7b9e972885fcfacf0f7b0f172ce Mon Sep 17 00:00:00 2001 From: Sergey Kandaurov Date: Mon, 20 Apr 2015 16:53:04 +0300 Subject: [PATCH] Core: allow shared memory size to be declared after a reference. For example, this fixes the case when "proxy_cache_path" is specified after "proxy_cache" that references it. --- src/core/ngx_cycle.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index e9dfdfc2a..eec7da592 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -1207,6 +1207,10 @@ ngx_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name, size_t size, void *tag) return NULL; } + if (shm_zone[i].shm.size == 0) { + shm_zone[i].shm.size = size; + } + if (size && size != shm_zone[i].shm.size) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "the size %uz of shared memory zone \"%V\" "