diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-01-09 15:59:20 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-01-09 15:59:20 +0000 |
| commit | 4e77a2bb83260015bd60156916178f0eb658da82 (patch) | |
| tree | edc252404be7793cf28b9ecf5a67daa9293b02b9 /src/core/ngx_cycle.c | |
| parent | 1691aaf290e90da6206b3ca5eea53676764f8432 (diff) | |
| download | nginx-4e77a2bb83260015bd60156916178f0eb658da82.tar.gz nginx-4e77a2bb83260015bd60156916178f0eb658da82.zip | |
pass the inherited shm_zone data
Diffstat (limited to 'src/core/ngx_cycle.c')
| -rw-r--r-- | src/core/ngx_cycle.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index ff4888ab2..2fd20b01b 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -402,6 +402,13 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) 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_init_cycle(ngx_cycle_t *old_cycle) 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; } |