commit 2349a6747d48a48cebcc5227f82083c33a799517
author Maxim Dounin <mdounin@mdounin.ru> Mon Mar 31 22:47:42 2014 +0400
committer Maxim Dounin <mdounin@mdounin.ru> Mon Mar 31 22:47:42 2014 +0400
tree f9d2103783a323998f0f87b12c78d551439e92de
parent 8877284863950c2a51d5b076a781437b81cd41e1

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

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index ac83f58..bfaa90e 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3710,8 +3710,7 @@
                               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);