# HG changeset patch
# User Valentin Bartenev <vbart@nginx.com>
# Date 1324841551 0
# Node ID 7697412a09211d827d4d006df8cf06cf50204871
# Parent  4e2551a83291e8ab913c7e0257cff99fc986dd28
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.

diff -r 4e2551a83291 -r 7697412a0921 src/http/modules/ngx_http_limit_conn_module.c
--- a/src/http/modules/ngx_http_limit_conn_module.c	Sun Dec 25 19:15:56 2011 +0000
+++ b/src/http/modules/ngx_http_limit_conn_module.c	Sun Dec 25 19:32:31 2011 +0000
@@ -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);
diff -r 4e2551a83291 -r 7697412a0921 src/http/modules/ngx_http_limit_req_module.c
--- a/src/http/modules/ngx_http_limit_req_module.c	Sun Dec 25 19:15:56 2011 +0000
+++ b/src/http/modules/ngx_http_limit_req_module.c	Sun Dec 25 19:32:31 2011 +0000
@@ -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,