]> git.kaiwu.me - nginx.git/commitdiff
Core: allow shared memory size to be declared after a reference.
authorSergey Kandaurov <pluknet@nginx.com>
Mon, 20 Apr 2015 13:53:04 +0000 (16:53 +0300)
committerSergey Kandaurov <pluknet@nginx.com>
Mon, 20 Apr 2015 13:53:04 +0000 (16:53 +0300)
For example, this fixes the case when "proxy_cache_path" is specified
after "proxy_cache" that references it.

src/core/ngx_cycle.c

index e9dfdfc2ace140ff28be8ee0e9ac393ab93e7192..eec7da5926925b3060edf47a1d6ba744722bd490 100644 (file)
@@ -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\" "