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

Fix case sensitivity in site addresses

Browse source
This commit is contained in:
Matthew Holt 2016-09-20 22:44:05 -06:00
parent 73916ccc30
commit bbf954cbf2
No known key found for this signature in database
GPG key ID: 0D97CC73664F4D03
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
caddyhttp/httpserver/plugin.go
View file

@ -65,7 +65,7 @@ type httpContext struct {
func (h *httpContext) saveConfig(key string, cfg *SiteConfig) {
h.siteConfigs = append(h.siteConfigs, cfg)
h.keysToSiteConfigs[key] = cfg
h.keysToSiteConfigs[strings.ToLower(key)] = cfg
}
// InspectServerBlocks make sure that everything checks out before
@ -171,13 +171,14 @@ func (h *httpContext) MakeServers() ([]caddy.Server, error) {
// new, empty one will be created.
func GetConfig(c *caddy.Controller) *SiteConfig {
ctx := c.Context().(*httpContext)
if cfg, ok := ctx.keysToSiteConfigs[c.Key]; ok {
key := strings.ToLower(c.Key)
if cfg, ok := ctx.keysToSiteConfigs[key]; ok {
return cfg
}
// we should only get here during tests because directive
// actions typically skip the server blocks where we make
// the configs
ctx.saveConfig(c.Key, &SiteConfig{Root: Root, TLS: new(caddytls.Config)})
ctx.saveConfig(key, &SiteConfig{Root: Root, TLS: new(caddytls.Config)})
return GetConfig(c)
}