From: Roman Arutyunyan <arut@nginx.com>
Date: Tue, 13 Dec 2016 14:17:25 +0000 (+0300)
Subject: Disabled js_include at server{} and location{} levels.
X-Git-Tag: 0.1.7~6
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=0e576105590bcc302bfef799fee4588e2bec0387;p=njs.git

Disabled js_include at server{} and location{} levels.
---

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index 83068160..6cf04823 100644
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -130,7 +130,7 @@ static char *ngx_http_js_merge_loc_conf(ngx_conf_t *cf, void *parent,
 static ngx_command_t  ngx_http_js_commands[] = {
 
     { ngx_string("js_include"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_http_js_include,
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c
index 377996cd..d1b670fb 100644
--- a/nginx/ngx_stream_js_module.c
+++ b/nginx/ngx_stream_js_module.c
@@ -105,7 +105,7 @@ static ngx_int_t ngx_stream_js_init(ngx_conf_t *cf);
 static ngx_command_t  ngx_stream_js_commands[] = {
 
     { ngx_string("js_include"),
-      NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
+      NGX_STREAM_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_stream_js_include,
       NGX_STREAM_SRV_CONF_OFFSET,
       0,