summaryrefslogtreecommitdiff
path: root/src/core/ngx_hash.c
diff options
context:
space:
mode:
authornginx <nginx@nginx.org>2015-04-07 16:06:25 +0000
committerJon Kolb <kolbyjack@gmail.com>2015-04-07 16:06:25 +0000
commit72e45e044fbfeab626688498132d6a3bed24bf70 (patch)
treedf621b5510d9d830b1a79bb006c2126e1346d650 /src/core/ngx_hash.c
parentab9c4cd3a4ed13f61ae572c15042df84d5fb9418 (diff)
downloadnginx-1.6.tar.gz
Changes with nginx 1.6.3 07 Apr 2015v1.6.3nginx-1.6
*) Feature: now the "tcp_nodelay" directive works with SPDY connections. *) Bugfix: in error handling. Thanks to Yichun Zhang and Daniil Bondarev. *) Bugfix: alerts "header already sent" appeared in logs if the "post_action" directive was used; the bug had appeared in 1.5.4. *) Bugfix: alerts "sem_post() failed" might appear in logs. *) Bugfix: in hash table handling. Thanks to Chris West. *) Bugfix: in integer overflow handling. Thanks to Régis Leroy.
Diffstat (limited to 'src/core/ngx_hash.c')
-rw-r--r--src/core/ngx_hash.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/ngx_hash.c b/src/core/ngx_hash.c
index c7bfed709..e707c0998 100644
--- a/src/core/ngx_hash.c
+++ b/src/core/ngx_hash.c
@@ -312,6 +312,8 @@ ngx_hash_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, ngx_uint_t nelts)
continue;
}
+ size = hinit->max_size;
+
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; "