diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2014-03-31 21:40:31 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2014-03-31 21:40:31 +0400 |
| commit | 2a620ae109cb97bd320ad367d9af2d9f7b24090c (patch) | |
| tree | 6f1e2d5101ef8758863f4d7cbdbd9f7564ecf179 | |
| parent | 23f66898463308fdc70ab2659273fb9804f29370 (diff) | |
| download | nginx-2a620ae109cb97bd320ad367d9af2d9f7b24090c.tar.gz nginx-2a620ae109cb97bd320ad367d9af2d9f7b24090c.zip | |
Core: hash now ignores bucket_size if it hits max_size limit.
| -rw-r--r-- | src/core/ngx_hash.c | 13 |
1 files changed, 5 insertions, 8 deletions
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: |