diff options
author | Igor Sysoev <igor@sysoev.ru> | 2008-06-17 19:00:30 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2008-06-17 19:00:30 +0400 |
commit | 7f6b2ffc60135a8340213fe8d5d0b70e479e3ac1 (patch) | |
tree | 90325238fc9a9d9a7e8818e76b60cc9e011242aa /src/http/ngx_http.c | |
parent | c2eb2cf4cba5f47fbc33eebe279f0d3855401421 (diff) |
*) back out r2040
*) refactor ngx_palloc()
*) introduce ngx_pnalloc()
*) additional pool blocks have smaller header
Diffstat (limited to 'src/http/ngx_http.c')
-rw-r--r-- | src/http/ngx_http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 91bc3e64f..ed4dacdbe 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1024,8 +1024,8 @@ ngx_http_create_locations_tree(ngx_conf_t *cf, ngx_queue_t *locations, lq = (ngx_http_location_queue_t *) q; len = lq->name->len - prefix; - node = ngx_palloc_aligned(cf->pool, - offsetof(ngx_http_location_tree_node_t, name) + len); + node = ngx_palloc(cf->pool, + offsetof(ngx_http_location_tree_node_t, name) + len); if (node == NULL) { return NULL; } @@ -1615,7 +1615,7 @@ ngx_http_init_listening(ngx_conf_t *cf, ngx_http_conf_in_port_t *in_port) hip->port = in_port->port; - hip->port_text.data = ngx_palloc(cf->pool, 7); + hip->port_text.data = ngx_pnalloc(cf->pool, 7); if (hip->port_text.data == NULL) { return NGX_ERROR; } |