commit 39f01e526fc30fc22c2a938c77701dbb4b51ccf2
author Valentin Bartenev <vbart@nginx.com> Sun Dec 25 19:32:31 2011 +0000
committer Valentin Bartenev <vbart@nginx.com> Sun Dec 25 19:32:31 2011 +0000
tree 7c511ad53cf13f8173ced894187e88757d772ebb
parent 197312f3a03de12d8183872cbb702bdf20e8cd04

Fixed limit_conn_log_level/limit_req_log_level inheritance.

The directives did not work if there were no limit_conn/limit_req specified on
the same level.

src/http/modules/ngx_http_limit_conn_module.c

diff --git a/src/http/modules/ngx_http_limit_conn_module.c b/src/http/modules/ngx_http_limit_conn_module.c
index a84d54d..40f05a2 100644
--- a/src/http/modules/ngx_http_limit_conn_module.c
+++ b/src/http/modules/ngx_http_limit_conn_module.c
@@ -483,7 +483,7 @@
     ngx_http_limit_conn_conf_t *conf = child;
 
     if (conf->limits.elts == NULL) {
-        *conf = *prev;
+        conf->limits = prev->limits;
     }
 
     ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR);

src/http/modules/ngx_http_limit_req_module.c

diff --git a/src/http/modules/ngx_http_limit_req_module.c b/src/http/modules/ngx_http_limit_req_module.c
index 718fae8..865f766 100644
--- a/src/http/modules/ngx_http_limit_req_module.c
+++ b/src/http/modules/ngx_http_limit_req_module.c
@@ -569,7 +569,7 @@
     ngx_http_limit_req_conf_t *conf = child;
 
     if (conf->shm_zone == NULL) {
-        *conf = *prev;
+        conf->shm_zone = prev->shm_zone;
     }
 
     ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level,