diff options
author | Francis Lavoie <lavofr@gmail.com> | 2022-01-18 13:27:43 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-18 11:27:43 -0700 |
commit | 93a7a45e7e1ca64dc0103af55ab2a0a4b9c6c84f (patch) | |
tree | 44151c2e6c376c090cd80def17ae8418f2a2fb86 /caddyconfig | |
parent | 1a7a78a1f27bdf58e9921cc636375385840a2dc5 (diff) |
httpcaddyfile: Fix incorrect handling of IPv6 bind addresses (#4532)
The `net.JoinHostPort()` function has some naiive logic for handling IPv6, it just checks if the host part has a `:` and if so it wraps the host part with `[ ]` but this causes our network type prefix to get wrapped as well, which is invalid for `caddy.NetworkAddress`. Instead, we can just concatenate the host and port manually here to avoid this side-effect.
Diffstat (limited to 'caddyconfig')
-rw-r--r-- | caddyconfig/httpcaddyfile/addresses.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/caddyconfig/httpcaddyfile/addresses.go b/caddyconfig/httpcaddyfile/addresses.go index a4f07ae..e2e7771 100644 --- a/caddyconfig/httpcaddyfile/addresses.go +++ b/caddyconfig/httpcaddyfile/addresses.go @@ -223,7 +223,7 @@ func (st *ServerType) listenerAddrsForServerBlockKey(sblock serverBlock, key str if err == nil && addr.IsUnixNetwork() { listeners[host] = struct{}{} } else { - listeners[net.JoinHostPort(host, lnPort)] = struct{}{} + listeners[host+":"+lnPort] = struct{}{} } } |