From b072c3d647545cadd3aea4d28dad97cf1af01b31 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 17 Apr 2009 19:09:08 +0000 Subject: [PATCH] fix the previous commit --- src/core/ngx_cycle.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 42aa18b44..ee5ac5216 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -482,7 +482,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) #else lock_file = ngx_pnalloc(cycle->pool, - cycle->lock_file.len + shm_zone[i].name.len); + cycle->lock_file.len + shm_zone[i].shm.name.len); if (lock_file == NULL) { goto failed; @@ -490,7 +490,8 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) (void) ngx_cpystrn(ngx_cpymem(lock_file, cycle->lock_file.data, cycle->lock_file.len), - shm_zone[i].name.data, shm_zone[i].name.len + 1); + shm_zone[i].shm.name.data, + shm_zone[i].shm.name.len + 1); #endif