Skip to content

Commit fba2689

Browse files
committed
Merge branch 'js-import-args' into 'master'
fix: update number of args for js_import See merge request f5/nginx/crossplane-go!27
2 parents 40fda1d + 82b73de commit fba2689

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

analyze.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const (
2222
ngxConf2More = 0x00002000 // >=2 args
2323

2424
// some helpful argument style aliases.
25-
ngxConfTake12 = ngxConfTake1 | ngxConfTake2
26-
// ngxConfTake13 = (ngxConfTake1 | ngxConfTake3) (currently unused).
25+
ngxConfTake12 = ngxConfTake1 | ngxConfTake2
26+
ngxConfTake13 = ngxConfTake1 | ngxConfTake3
2727
ngxConfTake23 = ngxConfTake2 | ngxConfTake3
2828
ngxConfTake34 = ngxConfTake3 | ngxConfTake4
2929
ngxConfTake123 = ngxConfTake12 | ngxConfTake3
@@ -2129,8 +2129,8 @@ var directives = map[string][]uint{
21292129
ngxHTTPLocConf | ngxHTTPLmtConf | ngxConfTake1,
21302130
},
21312131
"js_import": {
2132-
ngxHTTPMainConf | ngxConfTake1,
2133-
ngxStreamMainConf | ngxConfTake1,
2132+
ngxHTTPMainConf | ngxConfTake13,
2133+
ngxStreamMainConf | ngxConfTake13,
21342134
},
21352135
"js_include": {
21362136
ngxHTTPMainConf | ngxConfTake1,

0 commit comments

Comments
 (0)