SW/traefik
2
0
Fork 1
forked from Ivasoft/traefik
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge current branch v2.4 into master

Browse Source
This commit is contained in:
Jean-Baptiste Doumenjou
2021-03-09 11:32:01 +01:00
parent 606b43dc51 b1e11f3e88
commit 702e301990
100 changed files with 561 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/server_entrypoint_tcp.go
View File

@@ -362,11 +362,11 @@ func (ln tcpKeepAliveListener) Accept() (net.Conn, error) {
return nil, err
}
if err = tc.SetKeepAlive(true); err != nil {
if err := tc.SetKeepAlive(true); err != nil {
return nil, err
}
if err = tc.SetKeepAlivePeriod(3 * time.Minute); err != nil {
if err := tc.SetKeepAlivePeriod(3 * time.Minute); err != nil {
// Some systems, such as OpenBSD, have no user-settable per-socket TCP
// keepalive options.
if !errors.Is(err, syscall.ENOPROTOOPT) {