HTTP: fixed location merge.

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index f825c6182cdb13e924cb2dcb0370b29513141476..98eedfc33d8b80b7558a3a6e28cc3059c27b43fc 100644 (file)
--- 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;
 }