details: https://hg.nginx.org/njs/rev/eebf9e525358
branches:
changeset: 1493:eebf9e525358
user: Dmitry Volyntsev <xeioex@nginx.com>
date: Mon Aug 17 11:22:35 2020 +0000
description:
HTTP: fixed location merge.

diffstat:

nginx/ngx_http_js_module.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

diffs (14 lines):

diff -r 5a80b43b7098 -r eebf9e525358 nginx/ngx_http_js_module.c
--- a/nginx/ngx_http_js_module.c Thu Aug 13 13:40:36 2020 +0000
+++ b/nginx/ngx_http_js_module.c Mon Aug 17 11:22:35 2020 +0000
@@ -3363,5 +3363,10 @@ ngx_http_js_create_loc_conf(ngx_conf_t *
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;
}
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel