commit a4a054130809c5e37f4fb48cb2cdd66b4237e577
author Igor Sysoev <igor@sysoev.ru> Mon Nov 16 12:50:10 2009 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Nov 16 12:50:10 2009 +0000
tree 3e02ea9f92bb7183751eb4531cf526fc9a354071
parent 104ff87c39f416117676db4edea989723a89651d

align to minimum of a page and a pool sizes

src/core/ngx_palloc.c

diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c
index f3608c7..7db0d7d 100644
--- a/src/core/ngx_palloc.c
+++ b/src/core/ngx_palloc.c
@@ -17,7 +17,7 @@
 {
     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 @@
 
     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;
     }