github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-29 12:16:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #870 from mholt/close-idle-conn

Browse Source 
Close idle connections after graceful shutdown timeout
This commit is contained in:
Matt Holt 2016-06-07 09:38:58 -06:00
commit 01e05afa0c
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
caddyhttp/httpserver/server.go
View File

@ -52,6 +52,16 @@ func NewServer(addr string, group []*SiteConfig) (*Server, error) {
connTimeout: GracefulTimeout, connTimeout: GracefulTimeout,
} }
s.Server.Handler = s // this is weird, but whatever s.Server.Handler = s // this is weird, but whatever
s.Server.ConnState = func(c net.Conn, cs http.ConnState) {
if cs == http.StateIdle {
s.listenerMu.Lock()
// server stopped, close idle connection
if s.listener == nil {
c.Close()
}
s.listenerMu.Unlock()
}
}
// Disable HTTP/2 if desired // Disable HTTP/2 if desired
if !HTTP2 { if !HTTP2 {
@ -288,6 +298,7 @@ func (s *Server) Stop() (err error) {
s.listenerMu.Lock() s.listenerMu.Lock()
if s.listener != nil { if s.listener != nil {
err = s.listener.Close() err = s.listener.Close()
s.listener = nil
} }
s.listenerMu.Unlock() s.listenerMu.Unlock()