Mercurial > hg > nginx
comparison src/core/ngx_hash.c @ 5635:c348dea081fb
Core: hash now ignores bucket_size if it hits max_size limit.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 31 Mar 2014 21:40:31 +0400 |
parents | d2ed9fee092b |
children | 54f847c88cf7 |
comparison
equal
deleted
inserted
replaced
5634:5024d29354f1 | 5635:c348dea081fb |
---|---|
310 next: | 310 next: |
311 | 311 |
312 continue; | 312 continue; |
313 } | 313 } |
314 | 314 |
315 ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0, | 315 ngx_log_error(NGX_LOG_WARN, hinit->pool->log, 0, |
316 "could not build the %s, you should increase " | 316 "could not build optimal %s, you should increase " |
317 "either %s_max_size: %i or %s_bucket_size: %i", | 317 "either %s_max_size: %i or %s_bucket_size: %i; " |
318 "ignoring %s_bucket_size", | |
318 hinit->name, hinit->name, hinit->max_size, | 319 hinit->name, hinit->name, hinit->max_size, |
319 hinit->name, hinit->bucket_size); | 320 hinit->name, hinit->bucket_size, hinit->name); |
320 | |
321 ngx_free(test); | |
322 | |
323 return NGX_ERROR; | |
324 | 321 |
325 found: | 322 found: |
326 | 323 |
327 for (i = 0; i < size; i++) { | 324 for (i = 0; i < size; i++) { |
328 test[i] = sizeof(void *); | 325 test[i] = sizeof(void *); |