From c8307409c9b594380f4f5aae509f68bd0fd6ae47 Mon Sep 17 00:00:00 2001 From: Sergey Frolov Date: Tue, 25 Jul 2017 16:10:51 -0400 Subject: [PATCH] Add global FallbackHosts for vhost matching --- caddyhttp/httpserver/vhosttrie.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/caddyhttp/httpserver/vhosttrie.go b/caddyhttp/httpserver/vhosttrie.go index ac04fd8a..4023d034 100644 --- a/caddyhttp/httpserver/vhosttrie.go +++ b/caddyhttp/httpserver/vhosttrie.go @@ -45,6 +45,12 @@ func (t *vhostTrie) insertPath(remainingPath, originalPath string, site *SiteCon t.edges[ch].insertPath(remainingPath[1:], originalPath, site) } +// When matching a site, the given host will be tried first. +// Then, FallbackHosts will be tried in order. +// Default FallbackHosts are following wildcards, +// which could be modified by plugins and directives. +var FallbackHosts = []string{"0.0.0.0", ""} + // Match returns the virtual host (site) in v with // the closest match to key. If there was a match, // it returns the SiteConfig and the path portion of @@ -57,13 +63,13 @@ func (t *vhostTrie) insertPath(remainingPath, originalPath string, site *SiteCon // A typical key will be in the form "host" or "host/path". func (t *vhostTrie) Match(key string) (*SiteConfig, string) { host, path := t.splitHostPath(key) - // try the given host, then, if no match, try wildcard hosts + // try the given host, then, if no match, try fallback hosts branch := t.matchHost(host) - if branch == nil { - branch = t.matchHost("0.0.0.0") - } - if branch == nil { - branch = t.matchHost("") + for _, h := range FallbackHosts { + if branch != nil { + break + } + branch = t.matchHost(h) } if branch == nil { return nil, ""