details: http://hg.nginx.org/njs/rev/f9d2302afda1
branches:
changeset: 284:f9d2302afda1
user: Roman Arutyunyan <a...@nginx.com>
date: Tue Dec 13 17:17:25 2016 +0300
description:
Disabled js_include at server{} and location{} levels.
diffstat:
nginx/ngx_http_js_module.c | 2 +-
nginx/ngx_stream_js_module.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diffs (24 lines):
diff -r 43582218defe -r f9d2302afda1 nginx/ngx_http_js_module.c
--- a/nginx/ngx_http_js_module.c Tue Dec 13 14:18:40 2016 +0300
+++ b/nginx/ngx_http_js_module.c Tue Dec 13 17:17:25 2016 +0300
@@ -130,7 +130,7 @@ static char *ngx_http_js_merge_loc_conf(
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 -r 43582218defe -r f9d2302afda1 nginx/ngx_stream_js_module.c
--- a/nginx/ngx_stream_js_module.c Tue Dec 13 14:18:40 2016 +0300
+++ b/nginx/ngx_stream_js_module.c Tue Dec 13 17:17:25 2016 +0300
@@ -105,7 +105,7 @@ static ngx_int_t ngx_stream_js_init(ngx_
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,
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
