Mercurial > hg > nginx
comparison src/http/modules/ngx_http_limit_req_module.c @ 4399:d2b3130fd8d9
Fixed limit_req burst/nodelay inheritance (ticket #76).
The problem was introduced in r4381 (1.1.12).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 11 Jan 2012 11:09:05 +0000 |
parents | 7697412a0921 |
children | d620f497c50f |
comparison
equal
deleted
inserted
replaced
4398:3d51ba7f347b | 4399:d2b3130fd8d9 |
---|---|
568 ngx_http_limit_req_conf_t *prev = parent; | 568 ngx_http_limit_req_conf_t *prev = parent; |
569 ngx_http_limit_req_conf_t *conf = child; | 569 ngx_http_limit_req_conf_t *conf = child; |
570 | 570 |
571 if (conf->shm_zone == NULL) { | 571 if (conf->shm_zone == NULL) { |
572 conf->shm_zone = prev->shm_zone; | 572 conf->shm_zone = prev->shm_zone; |
573 conf->burst = prev->burst; | |
574 conf->nodelay = prev->nodelay; | |
573 } | 575 } |
574 | 576 |
575 ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level, | 577 ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level, |
576 NGX_LOG_ERR); | 578 NGX_LOG_ERR); |
577 | 579 |