OrgGo
/
caddy
mirror of https://github.com/caddyserver/caddy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use "IsUnixNetwork" function instead of repeating the logic

This commit is contained in:
Matthew Holt 2019-12-06 12:00:04 -07:00
parent 33a318d173
commit b07f6958ac
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
listeners.go
View File

@ -360,7 +360,7 @@ func SplitNetworkAddress(a string) (network, host, port string, err error) {
network = strings.ToLower(strings.TrimSpace(a[:idx])) network = strings.ToLower(strings.TrimSpace(a[:idx]))
a = a[idx+1:] a = a[idx+1:]
} }
if network == "unix" || network == "unixgram" || network == "unixpacket" { if isUnixNetwork(network) {
host = a host = a
return return
} }
@ -369,8 +369,9 @@ func SplitNetworkAddress(a string) (network, host, port string, err error) {
} }
// JoinNetworkAddress combines network, host, and port into a single // JoinNetworkAddress combines network, host, and port into a single
// address string of the form accepted by ParseNetworkAddress(). For unix sockets, the network // address string of the form accepted by ParseNetworkAddress(). For
// should be "unix" and the path to the socket should be given as the // unix sockets, the network should be "unix" (or "unixgram" or
// "unixpacket") and the path to the socket should be given as the
// host parameter. // host parameter.
func JoinNetworkAddress(network, host, port string) string { func JoinNetworkAddress(network, host, port string) string {
var a string var a string

2
modules/caddyhttp/reverseproxy/healthchecks.go
View File

@ -117,7 +117,7 @@ func (h *Handler) doActiveHealthChecksForAllHosts() {
return return
} }
hostAddr := addr.JoinHostPort(0) hostAddr := addr.JoinHostPort(0)
if addr.Network == "unix" || addr.Network == "unixgram" || addr.Network == "unixpacket" { if addr.IsUnixNetwork() {
// this will be used as the Host portion of a http.Request URL, and // this will be used as the Host portion of a http.Request URL, and
// paths to socket files would produce an error when creating URL, // paths to socket files would produce an error when creating URL,
// so use a fake Host value instead; unix sockets are usually local // so use a fake Host value instead; unix sockets are usually local