Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize server connection close logic #1310

Merged
merged 3 commits into from Jun 5, 2022
Merged

Optimize server connection close logic #1310

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4596f5a
server.go Make code more clear
stokito Jun 4, 2022
b967294
server.go Use direct SetConnectionClose()
stokito Jun 4, 2022
3760b29
server.go Simplify connectionClose evaluation
stokito Jun 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 8 additions & 10 deletions server.go
View file
Open in desktop
Expand Up @@ -2127,7 +2127,6 @@ func (s *Server) serveConn(c net.Conn) (err error) {
hijackNoResponse bool

connectionClose bool
isHTTP11 bool

continueReadingRequest bool = true
)
Expand Down Expand Up @@ -2323,8 +2322,8 @@ func (s *Server) serveConn(c net.Conn) (err error) {
}
}

// store req.ConnectionClose so even if it was changed inside of handler
connectionClose = s.DisableKeepalive || ctx.Request.Header.ConnectionClose()
isHTTP11 = ctx.Request.Header.IsHTTP11()

if serverName != nil {
ctx.Response.Header.SetServerBytes(serverName)
Expand Down Expand Up @@ -2354,10 +2353,6 @@ func (s *Server) serveConn(c net.Conn) (err error) {
hijackNoResponse = ctx.hijackNoResponse && hijackHandler != nil
ctx.hijackNoResponse = false

if s.MaxRequestsPerConn > 0 && connRequestNum >= uint64(s.MaxRequestsPerConn) {
ctx.SetConnectionClose()
}

if writeTimeout > 0 {
if err := c.SetWriteDeadline(time.Now().Add(writeTimeout)); err != nil {
panic(fmt.Sprintf("BUG: error in SetWriteDeadline(%v): %v", writeTimeout, err))
Expand All @@ -2371,11 +2366,14 @@ func (s *Server) serveConn(c net.Conn) (err error) {
previousWriteTimeout = 0
}

connectionClose = connectionClose || ctx.Response.ConnectionClose() || (s.CloseOnShutdown && atomic.LoadInt32(&s.stop) == 1)
connectionClose = connectionClose ||
(s.MaxRequestsPerConn > 0 && connRequestNum >= uint64(s.MaxRequestsPerConn)) ||
ctx.Response.Header.ConnectionClose() ||
(s.CloseOnShutdown && atomic.LoadInt32(&s.stop) == 1)
if connectionClose {
ctx.Response.Header.SetCanonical(strConnection, strClose)
} else if !isHTTP11 {
// Set 'Connection: keep-alive' response header for non-HTTP/1.1 request.
ctx.Response.Header.SetConnectionClose()
} else if !ctx.Request.Header.IsHTTP11() {
// Set 'Connection: keep-alive' response header for HTTP/1.0 request.
// There is no need in setting this header for http/1.1, since in http/1.1
// connections are keep-alive by default.
ctx.Response.Header.SetCanonical(strConnection, strKeepAlive)
Expand Down