aboutsummaryrefslogtreecommitdiff
path: root/server.go
diff options
context:
space:
mode:
authorGravatar Erik Dubbelboer <erik@dubbelboer.com> 2022-08-26 14:15:21 +0200
committerGravatar Erik Dubbelboer <erik@dubbelboer.com> 2022-08-26 14:15:21 +0200
commit28bec71c969aeb73ce4eabceac2b3469b2631c94 (patch)
treeeba16ef1ba289757fc8a142c6748234c2997ae24 /server.go
parentFix(server): reset maxRequestBodySize to the server's config (#1360) (diff)
downloadfasthttp-28bec71c969aeb73ce4eabceac2b3469b2631c94.tar.gz
fasthttp-28bec71c969aeb73ce4eabceac2b3469b2631c94.tar.bz2
fasthttp-28bec71c969aeb73ce4eabceac2b3469b2631c94.zip
Fix "use of closed network connection" error check
This was refactored out incorrectly in a previous change.
Diffstat (limited to 'server.go')
-rw-r--r--server.go22
1 files changed, 11 insertions, 11 deletions
diff --git a/server.go b/server.go
index 08dec4e..a7e93b1 100644
--- a/server.go
+++ b/server.go
@@ -1861,21 +1861,21 @@ func acceptConn(s *Server, ln net.Listener, lastPerIPErrorTime *time.Time) (net.
var c net.Conn
var err error
if tl, ok := ln.(*net.TCPListener); ok && s.TCPKeepalive {
- tc, err := tl.AcceptTCP()
- if err != nil {
- return nil, err
- }
- if err := tc.SetKeepAlive(s.TCPKeepalive); err != nil {
- tc.Close() //nolint:errcheck
- return nil, err
- }
- if s.TCPKeepalivePeriod > 0 {
- if err := tc.SetKeepAlivePeriod(s.TCPKeepalivePeriod); err != nil {
+ var tc *net.TCPConn
+ tc, err = tl.AcceptTCP()
+ if err == nil {
+ if err := tc.SetKeepAlive(s.TCPKeepalive); err != nil {
tc.Close() //nolint:errcheck
return nil, err
}
+ if s.TCPKeepalivePeriod > 0 {
+ if err := tc.SetKeepAlivePeriod(s.TCPKeepalivePeriod); err != nil {
+ tc.Close() //nolint:errcheck
+ return nil, err
+ }
+ }
+ c = tc
}
- c = tc
} else {
c, err = ln.Accept()
}