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

This commit is contained in:
Maxim Dounin 2014-03-31 21:40:31 +04:00
parent 23f6689846
commit 2a620ae109

View File

@ -312,15 +312,12 @@ ngx_hash_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, ngx_uint_t nelts)
continue; continue;
} }
ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0, ngx_log_error(NGX_LOG_WARN, hinit->pool->log, 0,
"could not build the %s, you should increase " "could not build optimal %s, you should increase "
"either %s_max_size: %i or %s_bucket_size: %i", "either %s_max_size: %i or %s_bucket_size: %i; "
"ignoring %s_bucket_size",
hinit->name, hinit->name, hinit->max_size, hinit->name, hinit->name, hinit->max_size,
hinit->name, hinit->bucket_size); hinit->name, hinit->bucket_size, hinit->name);
ngx_free(test);
return NGX_ERROR;
found: found: