diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2020-04-07 08:33:45 -0600 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2020-04-07 08:33:45 -0600 |
| commit | 8b2dbc52ec6bc0359b4b8c47a3f9835e9460649e (patch) | |
| tree | eb63256aa8efc1451cfea9ef3d6e4190395a5576 /modules | |
| parent | 657f0cab17c1597f4f78f15d0b720aa6f9d7fbcb (diff) | |
core: Rename ParsedAddress -> NetworkAddress
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/caddyhttp/autohttps.go | 2 | ||||
| -rw-r--r-- | modules/caddyhttp/reverseproxy/hosts.go | 2 | ||||
| -rw-r--r-- | modules/caddyhttp/reverseproxy/selectionpolicies.go | 4 | ||||
| -rw-r--r-- | modules/logging/netwriter.go | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/modules/caddyhttp/autohttps.go b/modules/caddyhttp/autohttps.go index 00853f8..ecb988a 100644 --- a/modules/caddyhttp/autohttps.go +++ b/modules/caddyhttp/autohttps.go @@ -82,7 +82,7 @@ func (app *App) automaticHTTPSPhase1(ctx caddy.Context, repl *caddy.Replacer) er // this maps domain names for automatic HTTP->HTTPS // redirects to their destination server address - redirDomains := make(map[string]caddy.ParsedAddress) + redirDomains := make(map[string]caddy.NetworkAddress) for srvName, srv := range app.Servers { // as a prerequisite, provision route matchers; this is diff --git a/modules/caddyhttp/reverseproxy/hosts.go b/modules/caddyhttp/reverseproxy/hosts.go index 87139c3..23759d1 100644 --- a/modules/caddyhttp/reverseproxy/hosts.go +++ b/modules/caddyhttp/reverseproxy/hosts.go @@ -138,7 +138,7 @@ func (u *Upstream) Full() bool { // field is used. Note that the returned value is not a pointer. func (u *Upstream) fillDialInfo(r *http.Request) (DialInfo, error) { repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer) - var addr caddy.ParsedAddress + var addr caddy.NetworkAddress if u.LookupSRV != "" { // perform DNS lookup for SRV records and choose one diff --git a/modules/caddyhttp/reverseproxy/selectionpolicies.go b/modules/caddyhttp/reverseproxy/selectionpolicies.go index 8a32135..7c36dec 100644 --- a/modules/caddyhttp/reverseproxy/selectionpolicies.go +++ b/modules/caddyhttp/reverseproxy/selectionpolicies.go @@ -370,12 +370,12 @@ func (s HeaderHashSelection) Select(pool UpstreamPool, req *http.Request) *Upstr } // UnmarshalCaddyfile sets up the module from Caddyfile tokens. -func (r *HeaderHashSelection) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { +func (s *HeaderHashSelection) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { for d.Next() { if !d.NextArg() { return d.ArgErr() } - r.Field = d.Val() + s.Field = d.Val() } return nil } diff --git a/modules/logging/netwriter.go b/modules/logging/netwriter.go index 7d2dafa..427bb75 100644 --- a/modules/logging/netwriter.go +++ b/modules/logging/netwriter.go @@ -31,7 +31,7 @@ func init() { type NetWriter struct { Address string `json:"address,omitempty"` - addr caddy.ParsedAddress + addr caddy.NetworkAddress } // CaddyModule returns the Caddy module information. |