# HG changeset patch # User Igor Sysoev # Date 1258375810 0 # Node ID b3aaccf50be22d48da0446c5aca076a713797da6 # Parent ed785dc26eefb2c871c3a4bc5057321e3367dcdf align to minimum of a page and a pool sizes diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c --- 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 * { 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_ 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; }