# HG changeset patch # User Maxim Dounin # Date 1326280145 0 # Node ID d2b3130fd8d9eeb395a481733d00d9d1baf0a123 # Parent 3d51ba7f347b9631b345743ff23cfc8778dd8be2 Fixed limit_req burst/nodelay inheritance (ticket #76). The problem was introduced in r4381 (1.1.12). diff --git a/src/http/modules/ngx_http_limit_req_module.c b/src/http/modules/ngx_http_limit_req_module.c --- a/src/http/modules/ngx_http_limit_req_module.c +++ b/src/http/modules/ngx_http_limit_req_module.c @@ -570,6 +570,8 @@ ngx_http_limit_req_merge_conf(ngx_conf_t if (conf->shm_zone == NULL) { conf->shm_zone = prev->shm_zone; + conf->burst = prev->burst; + conf->nodelay = prev->nodelay; } ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level,