Mercurial > hg > nginx

diff src/http/ngx_http_core_module.c @ 6314:fcbac620ae83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Style: NGX_PTR_SIZE replaced with sizeof(void *). The NGX_PTR_SIZE macro is only needed in preprocessor directives where it's not possible to use sizeof().
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 03 Dec 2015 20:06:45 +0300
parents 1d696c646d81
children cf5e822cf470
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3503,7 +3503,7 @@ ngx_http_core_merge_srv_conf(ngx_conf_t 
     /* TODO: it does not merge, it inits only */
 
     ngx_conf_merge_size_value(conf->connection_pool_size,
-                              prev->connection_pool_size, NGX_PTR_SIZE * 64);
+                              prev->connection_pool_size, 64 * sizeof(void *));
     ngx_conf_merge_size_value(conf->request_pool_size,
                               prev->request_pool_size, 4096);
     ngx_conf_merge_msec_value(conf->client_header_timeout,