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

httpserver: no SetKeepAlivePeriod in openbsd (#2787)

Browse Source 
* no SetKeepAlivePeriod on openbsd

* fix tcpKeepAliveListener.Accept signature
This commit is contained in:
Adil H 2019-10-08 16:49:40 +01:00 committed by Matt Holt
parent 16b296c97e
commit be2fdb6af6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
caddyhttp/httpserver/server.go
View File

@ -554,16 +554,20 @@ type tcpKeepAliveListener struct {
} }
// Accept accepts the connection with a keep-alive enabled. // Accept accepts the connection with a keep-alive enabled.
func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) { func (ln tcpKeepAliveListener) Accept() (net.Conn, error) {
tc, err := ln.AcceptTCP() tc, err := ln.AcceptTCP()
if err != nil { if err != nil {
return return nil, err
} }
if err = tc.SetKeepAlive(true); err != nil { if err = tc.SetKeepAlive(true); err != nil {
return return nil, err
} }
// OpenBSD has no user-settable per-socket TCP keepalive
// https://github.com/caddyserver/caddy/pull/2787
if runtime.GOOS != "openbsd" {
if err = tc.SetKeepAlivePeriod(3 * time.Minute); err != nil { if err = tc.SetKeepAlivePeriod(3 * time.Minute); err != nil {
return return nil, err
}
} }
return tc, nil return tc, nil
} }