Skip to content

Commit 28bec71

Browse files
Fix "use of closed network connection" error check
This was refactored out incorrectly in a previous change.
1 parent 3b147b7 commit 28bec71

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Diff for: server.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -1861,21 +1861,21 @@ func acceptConn(s *Server, ln net.Listener, lastPerIPErrorTime *time.Time) (net.
18611861
var c net.Conn
18621862
var err error
18631863
if tl, ok := ln.(*net.TCPListener); ok && s.TCPKeepalive {
1864-
tc, err := tl.AcceptTCP()
1865-
if err != nil {
1866-
return nil, err
1867-
}
1868-
if err := tc.SetKeepAlive(s.TCPKeepalive); err != nil {
1869-
tc.Close() //nolint:errcheck
1870-
return nil, err
1871-
}
1872-
if s.TCPKeepalivePeriod > 0 {
1873-
if err := tc.SetKeepAlivePeriod(s.TCPKeepalivePeriod); err != nil {
1864+
var tc *net.TCPConn
1865+
tc, err = tl.AcceptTCP()
1866+
if err == nil {
1867+
if err := tc.SetKeepAlive(s.TCPKeepalive); err != nil {
18741868
tc.Close() //nolint:errcheck
18751869
return nil, err
18761870
}
1871+
if s.TCPKeepalivePeriod > 0 {
1872+
if err := tc.SetKeepAlivePeriod(s.TCPKeepalivePeriod); err != nil {
1873+
tc.Close() //nolint:errcheck
1874+
return nil, err
1875+
}
1876+
}
1877+
c = tc
18771878
}
1878-
c = tc
18791879
} else {
18801880
c, err = ln.Accept()
18811881
}

0 commit comments

Comments
 (0)