Mercurial > hg > nginx

changeset 6116:48b3d5ddfb03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Sergey Kandaurov <pluknet@nginx.com>
date Mon, 20 Apr 2015 16:53:04 +0300
parents 61d7ae76647d
children 3b7a60371a9a
files src/core/ngx_cycle.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -1207,6 +1207,10 @@ ngx_shared_memory_add(ngx_conf_t *cf, ng
             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\" "