From 713787d6e090e0f28762c17c46e22e0be808887b Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Mon, 17 Aug 2020 11:22:35 +0000 Subject: [PATCH] HTTP: fixed location merge. --- nginx/ngx_http_js_module.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c index f825c618..98eedfc3 100644 --- a/nginx/ngx_http_js_module.c +++ b/nginx/ngx_http_js_module.c @@ -3363,5 +3363,10 @@ ngx_http_js_create_loc_conf(ngx_conf_t *cf) static char * ngx_http_js_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) { + ngx_http_js_loc_conf_t *prev = parent; + ngx_http_js_loc_conf_t *conf = child; + + ngx_conf_merge_str_value(conf->content, prev->content, ""); + return NGX_CONF_OK; } -- 2.47.3