diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-06-17 15:00:30 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-06-17 15:00:30 +0000 |
| commit | 7f6b2ffc60135a8340213fe8d5d0b70e479e3ac1 (patch) | |
| tree | 90325238fc9a9d9a7e8818e76b60cc9e011242aa /src/core/nginx.c | |
| parent | c2eb2cf4cba5f47fbc33eebe279f0d3855401421 (diff) | |
| download | nginx-7f6b2ffc60135a8340213fe8d5d0b70e479e3ac1.tar.gz nginx-7f6b2ffc60135a8340213fe8d5d0b70e479e3ac1.zip | |
*) back out r2040
*) refactor ngx_palloc()
*) introduce ngx_pnalloc()
*) additional pool blocks have smaller header
Diffstat (limited to 'src/core/nginx.c')
| -rw-r--r-- | src/core/nginx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 48e085ba3..450edf374 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -826,7 +826,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf) 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 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf) } 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; |