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

caddyhttp: Fix listener wrapper regression from #6573 (#6599)

Browse source
This commit is contained in:
Aaron Paterson 2024-10-01 01:47:21 -04:00 committed by GitHub
parent 4b1a9b6cc1
commit 0e829bc418
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
listeners.go
View file

@ -183,14 +183,14 @@ func (na NetworkAddress) listen(ctx context.Context, portOffset uint, config net
} }
} }
if ln == nil {
return nil, fmt.Errorf("unsupported network type: %s", na.Network)
}
if err != nil { if err != nil {
return nil, err return nil, err
} }
if ln == nil {
return nil, fmt.Errorf("unsupported network type: %s", na.Network)
}
if IsUnixNetwork(na.Network) { if IsUnixNetwork(na.Network) {
isAbstractUnixSocket := strings.HasPrefix(address, "@") isAbstractUnixSocket := strings.HasPrefix(address, "@")
if !isAbstractUnixSocket { if !isAbstractUnixSocket {

10
modules/caddyhttp/app.go
View file

@ -535,11 +535,6 @@ func (app *App) Start() error {
return fmt.Errorf("network '%s' cannot handle HTTP/1 or HTTP/2 connections", listenAddr.Network) return fmt.Errorf("network '%s' cannot handle HTTP/1 or HTTP/2 connections", listenAddr.Network)
} }
if useTLS {
// create TLS listener - this enables and terminates TLS
ln = tls.NewListener(ln, tlsCfg)
}
// wrap listener before TLS (up to the TLS placeholder wrapper) // wrap listener before TLS (up to the TLS placeholder wrapper)
var lnWrapperIdx int var lnWrapperIdx int
for i, lnWrapper := range srv.listenerWrappers { for i, lnWrapper := range srv.listenerWrappers {
@ -550,6 +545,11 @@ func (app *App) Start() error {
ln = lnWrapper.WrapListener(ln) ln = lnWrapper.WrapListener(ln)
} }
if useTLS {
// create TLS listener - this enables and terminates TLS
ln = tls.NewListener(ln, tlsCfg)
}
// finish wrapping listener where we left off before TLS // finish wrapping listener where we left off before TLS
for i := lnWrapperIdx; i < len(srv.listenerWrappers); i++ { for i := lnWrapperIdx; i < len(srv.listenerWrappers); i++ {
ln = srv.listenerWrappers[i].WrapListener(ln) ln = srv.listenerWrappers[i].WrapListener(ln)