From a4a054130809c5e37f4fb48cb2cdd66b4237e577 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 16 Nov 2009 12:50:10 +0000 Subject: [PATCH] align to minimum of a page and a pool sizes --- src/core/ngx_palloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c index f3608c782..7db0d7da4 100644 --- a/src/core/ngx_palloc.c +++ b/src/core/ngx_palloc.c @@ -17,7 +17,7 @@ ngx_create_pool(size_t size, ngx_log_t *log) { ngx_pool_t *p; - p = ngx_memalign(ngx_pagesize, size, log); + p = ngx_memalign(ngx_min(ngx_pagesize, size), size, log); if (p == NULL) { return NULL; } @@ -181,7 +181,7 @@ ngx_palloc_block(ngx_pool_t *pool, size_t size) psize = (size_t) (pool->d.end - (u_char *) pool); - m = ngx_memalign(ngx_pagesize, psize, pool->log); + m = ngx_memalign(ngx_min(ngx_pagesize, psize), psize, pool->log); if (m == NULL) { return NULL; }