From: Maxim Dounin <mdounin@mdounin.ru>
Date: Mon, 31 Mar 2014 17:40:31 +0000 (+0400)
Subject: Core: hash now ignores bucket_size if it hits max_size limit.
X-Git-Tag: release-1.5.13~11
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=2a620ae109cb97bd320ad367d9af2d9f7b24090c;p=nginx.git

Core: hash now ignores bucket_size if it hits max_size limit.
---

diff --git a/src/core/ngx_hash.c b/src/core/ngx_hash.c
index b53294502..fe95693ab 100644
--- a/src/core/ngx_hash.c
+++ b/src/core/ngx_hash.c
@@ -312,15 +312,12 @@ ngx_hash_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, ngx_uint_t nelts)
         continue;
     }
 
-    ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0,
-                  "could not build the %s, you should increase "
-                  "either %s_max_size: %i or %s_bucket_size: %i",
+    ngx_log_error(NGX_LOG_WARN, hinit->pool->log, 0,
+                  "could not build optimal %s, you should increase "
+                  "either %s_max_size: %i or %s_bucket_size: %i; "
+                  "ignoring %s_bucket_size",
                   hinit->name, hinit->name, hinit->max_size,
-                  hinit->name, hinit->bucket_size);
-
-    ngx_free(test);
-
-    return NGX_ERROR;
+                  hinit->name, hinit->bucket_size, hinit->name);
 
 found: