Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Make sure Root is set for all new SiteConfigs

Browse source 
This situation typically only arises in tests...
This commit is contained in:
Matthew Holt 2016-06-05 23:34:16 -06:00
parent ff22fbd79a
commit 71c14fa16e
No known key found for this signature in database
GPG key ID: 0D97CC73664F4D03
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
caddyhttp/httpserver/plugin.go
View file

@ -155,8 +155,7 @@ func GetConfig(addrKey string) *SiteConfig {
// this shouldn't happen except in tests // this shouldn't happen except in tests
newContext() newContext()
} }
cfg := new(SiteConfig) cfg := &SiteConfig{Root: Root, TLS: new(caddytls.Config)}
cfg.TLS = new(caddytls.Config)
defaultCtx := contexts[len(contexts)-1] defaultCtx := contexts[len(contexts)-1]
defaultCtx.siteConfigs = append(defaultCtx.siteConfigs, cfg) defaultCtx.siteConfigs = append(defaultCtx.siteConfigs, cfg)
defaultCtx.keysToSiteConfigs[addrKey] = cfg defaultCtx.keysToSiteConfigs[addrKey] = cfg