commit 7f6b2ffc60135a8340213fe8d5d0b70e479e3ac1
author Igor Sysoev <igor@sysoev.ru> Tue Jun 17 15:00:30 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Jun 17 15:00:30 2008 +0000
tree 90325238fc9a9d9a7e8818e76b60cc9e011242aa
parent c2eb2cf4cba5f47fbc33eebe279f0d3855401421

*) back out r2040
*) refactor ngx_palloc()
*) introduce ngx_pnalloc()
*) additional pool blocks have smaller header

src/core/nginx.c

diff --git a/src/core/nginx.c b/src/core/nginx.c
index 48e085b..450edf3 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -826,7 +826,7 @@
 
     ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT);
 
-    ccf->oldpid.data = ngx_palloc(cycle->pool, ccf->oldpid.len);
+    ccf->oldpid.data = ngx_pnalloc(cycle->pool, ccf->oldpid.len);
     if (ccf->oldpid.data == NULL) {
         return NGX_CONF_ERROR;
     }
@@ -870,7 +870,7 @@
 
     } else {
         cycle->lock_file.len = ccf->lock_file.len + 1;
-        cycle->lock_file.data = ngx_palloc(cycle->pool,
+        cycle->lock_file.data = ngx_pnalloc(cycle->pool,
                                       ccf->lock_file.len + sizeof(".accept"));
         if (cycle->lock_file.data == NULL) {
             return NGX_CONF_ERROR;