[nginx] svn commit: r4381 - trunk/src/http/modules

[vbart at nginx.com]

Author: vbart
Date: 2011-12-25 19:32:31 +0000 (Sun, 25 Dec 2011)
New Revision: 4381

Log:
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.


Modified:
   trunk/src/http/modules/ngx_http_limit_conn_module.c
   trunk/src/http/modules/ngx_http_limit_req_module.c

Modified: trunk/src/http/modules/ngx_http_limit_conn_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_limit_conn_module.c	2011-12-25 19:15:56 UTC (rev 4380)
+++ trunk/src/http/modules/ngx_http_limit_conn_module.c	2011-12-25 19:32:31 UTC (rev 4381)
@@ -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);

Modified: trunk/src/http/modules/ngx_http_limit_req_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_limit_req_module.c	2011-12-25 19:15:56 UTC (rev 4380)
+++ trunk/src/http/modules/ngx_http_limit_req_module.c	2011-12-25 19:32:31 UTC (rev 4381)
@@ -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,