diff options
| -rw-r--r-- | modules/caddyhttp/caddyhttp.go | 5 | ||||
| -rw-r--r-- | modules/caddyhttp/templates/tplcontext.go | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/modules/caddyhttp/caddyhttp.go b/modules/caddyhttp/caddyhttp.go index ffd7d0f..009e564 100644 --- a/modules/caddyhttp/caddyhttp.go +++ b/modules/caddyhttp/caddyhttp.go @@ -203,10 +203,9 @@ func (app *App) automaticHTTPS() error { for _, m := range matcherSet { if hm, ok := m.(*MatchHost); ok { for _, d := range *hm { - if !certmagic.HostQualifies(d) { - continue + if certmagic.HostQualifies(d) { + domainSet[d] = struct{}{} } - domainSet[d] = struct{}{} } } } diff --git a/modules/caddyhttp/templates/tplcontext.go b/modules/caddyhttp/templates/tplcontext.go index 83fe19e..d89f106 100644 --- a/modules/caddyhttp/templates/tplcontext.go +++ b/modules/caddyhttp/templates/tplcontext.go @@ -117,12 +117,8 @@ func (c templateContext) Cookie(name string) string { return "" } -// ReqHeader gets the value of a request header with field name. -func (c templateContext) ReqHeader(name string) string { - return c.Req.Header.Get(name) -} - // Hostname gets the (remote) hostname of the client making the request. +// Performance warning: This involves a DNS lookup. func (c templateContext) Hostname() string { ip := c.IP() @@ -134,8 +130,8 @@ func (c templateContext) Hostname() string { return hostnameList[0] } -// IP gets the (remote) IP address of the client making the request. -func (c templateContext) IP() string { +// RemoteIP gets the IP address of the client making the request. +func (c templateContext) RemoteIP() string { ip, _, err := net.SplitHostPort(c.Req.RemoteAddr) if err != nil { return c.Req.RemoteAddr |