From: Maxim Dounin <mdounin@mdounin.ru>
Date: Wed, 11 Jan 2012 11:09:05 +0000 (+0000)
Subject: Fixed limit_req burst/nodelay inheritance (ticket #76).
X-Git-Tag: release-1.1.13~8
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=f2ef9db230374f5f8ff31ea3f09e02b55da892b5;p=nginx.git

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
index 865f7666d..779b397c2 100644
--- 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 *cf, void *parent, void *child)
 
     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,