Browse Source

Oops

master
Matthew Holt 6 years ago
parent
commit
81a9e125b5
  1. 2
      modules/caddyhttp/templates/tplcontext.go
  2. 2
      modules/caddyhttp/templates/tplcontext_test.go
  3. 2
      modules/caddytls/tls.go

2
modules/caddyhttp/templates/tplcontext.go

@ -120,7 +120,7 @@ func (c templateContext) Cookie(name string) string {
// 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()
ip := c.RemoteIP()
hostnameList, err := net.LookupAddr(ip)
if err != nil || len(hostnameList) == 0 {

2
modules/caddyhttp/templates/tplcontext_test.go

@ -122,7 +122,7 @@ func TestIP(t *testing.T) {
{`[fe80:1::3%eth0]:44`, `fe80:1::3%eth0`},
} {
context.Req.RemoteAddr = test.inputRemoteAddr
if actual := context.IP(); actual != test.expect {
if actual := context.RemoteIP(); actual != test.expect {
t.Errorf("Test %d: Expected %s but got %s", i, test.expect, actual)
}
}

2
modules/caddytls/tls.go

@ -197,7 +197,7 @@ type AutomationConfig struct {
// management of managed TLS certificates.
type AutomationPolicy struct {
Hosts []string `json:"hosts,omitempty"`
ManagementRaw json.RawMessage `json:"management"`
ManagementRaw json.RawMessage `json:"management,omitempty"`
Management managerMaker `json:"-"`
}

Loading…
Cancel
Save