From 2349a6747d48a48cebcc5227f82083c33a799517 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 31 Mar 2014 22:47:42 +0400 Subject: [PATCH] Adjusted default value of types_hash_bucket_size (ticket #352). The ngx_cacheline_size may be too low on some platforms, resulting in unexpected hash build problems (as no collisions are tolerated due to low bucket_size, and max_size isn't big enough to build a hash without collisions). These problems aren't fatal anymore but nevertheless need to be addressed. --- src/http/ngx_http_core_module.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index ac83f58b6..bfaa90e76 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -3710,8 +3710,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) prev->types_hash_max_size, 1024); ngx_conf_merge_uint_value(conf->types_hash_bucket_size, - prev->types_hash_bucket_size, - ngx_cacheline_size); + prev->types_hash_bucket_size, 64); conf->types_hash_bucket_size = ngx_align(conf->types_hash_bucket_size, ngx_cacheline_size);