commit 4e77a2bb83260015bd60156916178f0eb658da82
author Igor Sysoev <igor@sysoev.ru> Tue Jan 09 15:59:20 2007 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Jan 09 15:59:20 2007 +0000
tree edc252404be7793cf28b9ecf5a67daa9293b02b9
parent 1691aaf290e90da6206b3ca5eea53676764f8432

pass the inherited shm_zone data

src/core/ngx_cycle.c

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index ff4888a..2fd20b0 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -402,6 +402,13 @@
 
             if (shm_zone[i].shm.size == oshm_zone[n].shm.size) {
                 shm_zone[i].shm.addr = oshm_zone[n].shm.addr;
+
+                if (shm_zone[i].init(&shm_zone[i], oshm_zone[n].data)
+                    != NGX_OK)
+                {
+                    goto failed;
+                }
+
                 goto found;
             }
 
@@ -446,7 +453,7 @@
 
         ngx_slab_init(shpool);
 
-        if (shm_zone[i].init(&shm_zone[i]) != NGX_OK) {
+        if (shm_zone[i].init(&shm_zone[i], NULL) != NGX_OK) {
             goto failed;
         }