Mercurial > hg > nginx

diff src/http/ngx_http_core_module.c @ 3388:d788521e4b0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix r3331: *) now pools are aligned to 16 bytes *) forbidden to set non-aligned pool sizes
author Igor Sysoev <igor@sysoev.ru>
date Thu, 17 Dec 2009 12:25:46 +0000
parents 49f977515733
children 8854f4eb2839
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -4318,8 +4318,15 @@ ngx_http_core_pool_size(ngx_conf_t *cf, 
 
     if (*sp < NGX_MIN_POOL_SIZE) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "pool must be no less than %uz", NGX_MIN_POOL_SIZE);
-
+                           "the pool size must be no less than %uz",
+                           NGX_MIN_POOL_SIZE);
+        return NGX_CONF_ERROR;
+    }
+
+    if (*sp % NGX_POOL_ALIGNMENT) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "the pool size must be a multiple of %uz",
+                           NGX_POOL_ALIGNMENT);
         return NGX_CONF_ERROR;
     }