diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-12-21 12:30:30 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-12-21 12:30:30 +0000 |
commit | b1dfe478a03ad6919f174812951f6a2bec8befae (patch) | |
tree | d8802484f8dbf5309b17a95b5fc9749627720a53 /src/core/ngx_palloc.c | |
parent | 5275a8b3ac534ff36973801ec2aa6ce1214d7cc9 (diff) | |
download | nginx-b1dfe478a03ad6919f174812951f6a2bec8befae.tar.gz nginx-b1dfe478a03ad6919f174812951f6a2bec8befae.zip |
nginx-0.1.13-RELEASE importrelease-0.1.13
*) Feature: the server_names_hash and server_names_hash_threshold
directives.
*) Bugfix: the *.domain.tld names in the "server_name" directive did
not work.
*) Bugfix: the %request_length log parameter logged the incorrect
length.
Diffstat (limited to 'src/core/ngx_palloc.c')
-rw-r--r-- | src/core/ngx_palloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c index ed13de513..c1b55e552 100644 --- a/src/core/ngx_palloc.c +++ b/src/core/ngx_palloc.c @@ -36,7 +36,7 @@ void ngx_destroy_pool(ngx_pool_t *pool) ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc); if (l->alloc) { - free(l->alloc); + ngx_free(l->alloc); } } @@ -59,7 +59,7 @@ void ngx_destroy_pool(ngx_pool_t *pool) #endif for (p = pool, n = pool->next; /* void */; p = n, n = n->next) { - free(p); + ngx_free(p); if (n == NULL) { break; @@ -163,7 +163,7 @@ ngx_int_t ngx_pfree(ngx_pool_t *pool, void *p) if (p == l->alloc) { ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %p", l->alloc); - free(l->alloc); + ngx_free(l->alloc); l->alloc = NULL; return NGX_OK; |