aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_palloc.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-12-17 12:25:46 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-12-17 12:25:46 +0000
commit04799a6f7c69c525969255a3bf5acaa4959552d4 (patch)
tree66be6a0caa6ca245b1c1002cfd8bb006264ab65f /src/core/ngx_palloc.c
parenta75362dcdbd5d8d911ddf135f71b3be68ce5ef31 (diff)
downloadnginx-04799a6f7c69c525969255a3bf5acaa4959552d4.tar.gz
nginx-04799a6f7c69c525969255a3bf5acaa4959552d4.zip
fix r3331:
*) now pools are aligned to 16 bytes *) forbidden to set non-aligned pool sizes
Diffstat (limited to 'src/core/ngx_palloc.c')
-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 7db0d7da4..35f13119c 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_min(ngx_pagesize, size), size, log);
+ p = ngx_memalign(NGX_POOL_ALIGNMENT, 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_min(ngx_pagesize, psize), psize, pool->log);
+ m = ngx_memalign(NGX_POOL_ALIGNMENT, psize, pool->log);
if (m == NULL) {
return NULL;
}