summaryrefslogtreecommitdiffstats
path: root/usr.sbin/nginx/src/http/modules/ngx_http_limit_zone_module.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/nginx/src/http/modules/ngx_http_limit_zone_module.c')
-rw-r--r--usr.sbin/nginx/src/http/modules/ngx_http_limit_zone_module.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/nginx/src/http/modules/ngx_http_limit_zone_module.c b/usr.sbin/nginx/src/http/modules/ngx_http_limit_zone_module.c
index 31df316e483..d92f5354a63 100644
--- a/usr.sbin/nginx/src/http/modules/ngx_http_limit_zone_module.c
+++ b/usr.sbin/nginx/src/http/modules/ngx_http_limit_zone_module.c
@@ -1,6 +1,7 @@
/*
* Copyright (C) Igor Sysoev
+ * Copyright (C) Nginx, Inc.
*/
@@ -421,7 +422,8 @@ ngx_http_limit_zone_merge_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_http_limit_zone_conf_t *conf = child;
if (conf->shm_zone == NULL) {
- *conf = *prev;
+ conf->shm_zone = prev->shm_zone;
+ conf->conn = prev->conn;
}
ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR);