]> git.kaiwu.me - nginx.git/commitdiff
fix the previous commit
authorIgor Sysoev <igor@sysoev.ru>
Fri, 17 Apr 2009 19:09:08 +0000 (19:09 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Fri, 17 Apr 2009 19:09:08 +0000 (19:09 +0000)
src/core/ngx_cycle.c

index 42aa18b44e3721ea301ebcb29365e8d31867f90e..ee5ac52166e6fe51f250a422c510aa175c867ce3 100644 (file)
@@ -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