Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-22 16:46:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

httpcaddyfile: 'bind' properly parses unix sockets (fixes #2999)

Browse source
This commit is contained in:
Matthew Holt 2020-03-19 09:43:17 -06:00
parent 406df22a16
commit 31c6ac097e
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
caddyconfig/httpcaddyfile/addresses.go
View file

@ -21,6 +21,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/modules/caddyhttp" "github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/certmagic" "github.com/caddyserver/certmagic"
@ -199,7 +200,12 @@ func (st *ServerType) listenerAddrsForServerBlockKey(sblock serverBlock, key str
// use a map to prevent duplication // use a map to prevent duplication
listeners := make(map[string]struct{}) listeners := make(map[string]struct{})
for _, host := range lnHosts { for _, host := range lnHosts {
listeners[net.JoinHostPort(host, lnPort)] = struct{}{} addr, err := caddy.ParseNetworkAddress(host)
if err == nil && addr.IsUnixNetwork() {
listeners[host] = struct{}{}
} else {
listeners[net.JoinHostPort(host, lnPort)] = struct{}{}
}
} }
// now turn map into list // now turn map into list