serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-26 13:43:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: Properly preserve unix sockets (fix #5568)

Browse source
This commit is contained in:
Matthew Holt 2023-06-21 17:16:01 -06:00
parent 0468508e92
commit 806341e089
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
listeners.go
View file

@ -189,13 +189,15 @@ func (na NetworkAddress) listen(ctx context.Context, portOffset uint, config net
// if new listener is a unix socket, make sure we can reuse it later // if new listener is a unix socket, make sure we can reuse it later
// (we do our own "unlink on close" -- not required, but more tidy) // (we do our own "unlink on close" -- not required, but more tidy)
one := int32(1) one := int32(1)
switch unix := ln.(type) { switch lnValue := ln.(type) {
case *net.UnixListener: case deleteListener:
unix.SetUnlinkOnClose(false) if unix, ok := lnValue.Listener.(*net.UnixListener); ok {
ln = &unixListener{unix, lnKey, &one} unix.SetUnlinkOnClose(false)
unixSockets[lnKey] = ln.(*unixListener) ln = &unixListener{unix, lnKey, &one}
unixSockets[lnKey] = ln.(*unixListener)
}
case *net.UnixConn: case *net.UnixConn:
ln = &unixConn{unix, address, lnKey, &one} ln = &unixConn{lnValue, address, lnKey, &one}
unixSockets[lnKey] = ln.(*unixConn) unixSockets[lnKey] = ln.(*unixConn)
} }