Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-27 23:03:37 -05:00
Code Issues Activity

add nil check

Browse source
This commit is contained in:
Craig Peterson 2017-10-13 11:08:17 -04:00
parent 425f61142f
commit 3a969bc075
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
caddyfile/parse.go
View file

@ -247,7 +247,7 @@ func (p *parser) doImport() error {
var importedTokens []Token var importedTokens []Token
// first check macros. That is a simple, non-recursive replacement // first check macros. That is a simple, non-recursive replacement
if p.definedMacros[importPattern] != nil { if p.definedMacros != nil && p.definedMacros[importPattern] != nil {
importedTokens = p.definedMacros[importPattern] importedTokens = p.definedMacros[importPattern]
} else { } else {
// make path relative to Caddyfile rather than current working directory (issue #867) // make path relative to Caddyfile rather than current working directory (issue #867)