Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-08-07 09:04:04 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: Use KeepAliveConfig to pass keepalive_interval to listener's accepted sockets (#7151)

Browse Source 
Fix #7144
This commit is contained in:
joshuamcbeth 2025-08-02 11:43:34 -04:00 committed by GitHub
parent 5bc2afbbb6
commit e4447c4ba7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
listen.go
View File

@ -107,7 +107,8 @@ func listenReusable(ctx context.Context, lnKey string, network, address string,
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &fakeCloseListener{sharedListener: sharedLn.(*sharedListener), keepAlivePeriod: config.KeepAlive}, nil
return &fakeCloseListener{sharedListener: sharedLn.(*sharedListener), keepAliveConfig: config.KeepAliveConfig}, nil
} }
// fakeCloseListener is a private wrapper over a listener that // fakeCloseListener is a private wrapper over a listener that
@ -121,12 +122,11 @@ func listenReusable(ctx context.Context, lnKey string, network, address string,
type fakeCloseListener struct { type fakeCloseListener struct {
closed int32 // accessed atomically; belongs to this struct only closed int32 // accessed atomically; belongs to this struct only
*sharedListener // embedded, so we also become a net.Listener *sharedListener // embedded, so we also become a net.Listener
keepAlivePeriod time.Duration keepAliveConfig net.KeepAliveConfig
} }
type canSetKeepAlive interface { type canSetKeepAliveConfig interface {
SetKeepAlivePeriod(d time.Duration) error SetKeepAliveConfig(config net.KeepAliveConfig) error
SetKeepAlive(bool) error
} }
func (fcl *fakeCloseListener) Accept() (net.Conn, error) { func (fcl *fakeCloseListener) Accept() (net.Conn, error) {
@ -140,12 +140,8 @@ func (fcl *fakeCloseListener) Accept() (net.Conn, error) {
if err == nil { if err == nil {
// if 0, do nothing, Go's default is already set // if 0, do nothing, Go's default is already set
// and if the connection allows setting KeepAlive, set it // and if the connection allows setting KeepAlive, set it
if tconn, ok := conn.(canSetKeepAlive); ok && fcl.keepAlivePeriod != 0 { if tconn, ok := conn.(canSetKeepAliveConfig); ok && fcl.keepAliveConfig.Enable {
if fcl.keepAlivePeriod > 0 { err = tconn.SetKeepAliveConfig(fcl.keepAliveConfig)
err = tconn.SetKeepAlivePeriod(fcl.keepAlivePeriod)
} else { // negative
err = tconn.SetKeepAlive(false)
}
if err != nil { if err != nil {
Log().With(zap.String("server", fcl.sharedListener.key)).Warn("unable to set keepalive for new connection:", zap.Error(err)) Log().With(zap.String("server", fcl.sharedListener.key)).Warn("unable to set keepalive for new connection:", zap.Error(err))
} }

7
modules/caddyhttp/app.go
View File

@ -531,7 +531,12 @@ func (app *App) Start() error {
if h1ok || h2ok && useTLS || h2cok { if h1ok || h2ok && useTLS || h2cok {
// create the listener for this socket // create the listener for this socket
lnAny, err := listenAddr.Listen(app.ctx, portOffset, net.ListenConfig{KeepAlive: time.Duration(srv.KeepAliveInterval)}) lnAny, err := listenAddr.Listen(app.ctx, portOffset, net.ListenConfig{
KeepAliveConfig: net.KeepAliveConfig{
Enable: srv.KeepAliveInterval != 0,
Interval: time.Duration(srv.KeepAliveInterval),
},
})
if err != nil { if err != nil {
return fmt.Errorf("listening on %s: %v", listenAddr.At(portOffset), err) return fmt.Errorf("listening on %s: %v", listenAddr.At(portOffset), err)
} }