Mercurial > hg > nginx

changeset 4399:d2b3130fd8d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3d51ba7f347b
children a0505851e70c
files src/http/modules/ngx_http_limit_req_module.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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,