aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-11-16 12:50:10 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-11-16 12:50:10 +0000
commita4a054130809c5e37f4fb48cb2cdd66b4237e577 (patch)
tree3e02ea9f92bb7183751eb4531cf526fc9a354071 /src
parent104ff87c39f416117676db4edea989723a89651d (diff)
downloadnginx-a4a054130809c5e37f4fb48cb2cdd66b4237e577.tar.gz
nginx-a4a054130809c5e37f4fb48cb2cdd66b4237e577.zip
align to minimum of a page and a pool sizes
Diffstat (limited to 'src')
-rw-r--r--src/core/ngx_palloc.c4
1 files 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;
}