Infrastructure/caddy
1
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-16 21:56:40 -05:00
Code Issues Activity

caddyhttp: Set default ReadHeaderTimeout (1 min)

Browse source 
Ref. #6663
This commit is contained in:
Matthew Holt 2024-11-19 11:24:12 -07:00
parent b3ce260389
commit 197c564f20
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/caddyhttp/app.go
View file

@ -401,6 +401,9 @@ func (app *App) Provision(ctx caddy.Context) error {
if srv.IdleTimeout == 0 { if srv.IdleTimeout == 0 {
srv.IdleTimeout = defaultIdleTimeout srv.IdleTimeout = defaultIdleTimeout
} }
if srv.ReadHeaderTimeout == 0 {
srv.ReadHeaderTimeout = defaultReadHeaderTimeout // see #6663
}
} }
ctx.Context = oldContext ctx.Context = oldContext
return nil return nil
@ -770,11 +773,20 @@ func (app *App) httpsPort() int {
return app.HTTPSPort return app.HTTPSPort
} }
// defaultIdleTimeout is the default HTTP server timeout const (
// for closing idle connections; useful to avoid resource // defaultIdleTimeout is the default HTTP server timeout
// exhaustion behind hungry CDNs, for example (we've had // for closing idle connections; useful to avoid resource
// several complaints without this). // exhaustion behind hungry CDNs, for example (we've had
const defaultIdleTimeout = caddy.Duration(5 * time.Minute) // several complaints without this).
defaultIdleTimeout = caddy.Duration(5 * time.Minute)
// defaultReadHeaderTimeout is the default timeout for
// reading HTTP headers from clients. Headers are generally
// small, often less than 1 KB, so it shouldn't take a
// long time even on legitimately slow connections or
// busy servers to read it.
defaultReadHeaderTimeout = caddy.Duration(time.Minute)
)
// Interface guards // Interface guards
var ( var (

1
modules/caddyhttp/server.go
View file

@ -61,6 +61,7 @@ type Server struct {
ReadTimeout caddy.Duration `json:"read_timeout,omitempty"` ReadTimeout caddy.Duration `json:"read_timeout,omitempty"`
// ReadHeaderTimeout is like ReadTimeout but for request headers. // ReadHeaderTimeout is like ReadTimeout but for request headers.
// Default is 1 minute.
ReadHeaderTimeout caddy.Duration `json:"read_header_timeout,omitempty"` ReadHeaderTimeout caddy.Duration `json:"read_header_timeout,omitempty"`
// WriteTimeout is how long to allow a write to a client. Note // WriteTimeout is how long to allow a write to a client. Note