CERBERUS/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2026-07-10 02:46:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #1374 from mholt/go18timeouts

Browse source 
Set Go 1.8's ReadHeaderTimeout and IdleTimeout
This commit is contained in:
Matt Holt 2017-02-16 16:51:00 -07:00 • committed by GitHub
commit 0cc48e849c
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
caddyhttp/httpserver/server.go
View file

@ -400,11 +400,10 @@ func makeHTTPServer(addr string, group []*SiteConfig) *http.Server {
}
// set the final values on the server
// TODO: ReadHeaderTimeout and IdleTimeout require Go 1.8
s.ReadTimeout = min.ReadTimeout
// s.ReadHeaderTimeout = min.ReadHeaderTimeout
s.ReadHeaderTimeout = min.ReadHeaderTimeout
s.WriteTimeout = min.WriteTimeout
// s.IdleTimeout = min.IdleTimeout
s.IdleTimeout = min.IdleTimeout
return s
}