Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-02 14:17:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

reverseproxy: Accept integer values for flush_interval (fix #2996)

Browse source
This commit is contained in:
Matthew Holt 2020-01-22 09:34:16 -07:00
parent 2105d59936
commit 5b878d5bd3
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/caddyhttp/reverseproxy/caddyfile.go
View file

@ -335,11 +335,15 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
if !d.NextArg() { if !d.NextArg() {
return d.ArgErr() return d.ArgErr()
} }
if fi, err := strconv.Atoi(d.Val()); err == nil {
h.FlushInterval = caddy.Duration(fi)
} else {
dur, err := time.ParseDuration(d.Val()) dur, err := time.ParseDuration(d.Val())
if err != nil { if err != nil {
return d.Errf("bad duration value '%s': %v", d.Val(), err) return d.Errf("bad duration value '%s': %v", d.Val(), err)
} }
h.FlushInterval = caddy.Duration(dur) h.FlushInterval = caddy.Duration(dur)
}
case "header_up": case "header_up":
if h.Headers == nil { if h.Headers == nil {
@ -511,7 +515,7 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
h.TLS = new(TLSConfig) h.TLS = new(TLSConfig)
} }
h.TLS.RootCAPemFiles = args h.TLS.RootCAPEMFiles = args
case "keepalive": case "keepalive":
if !d.NextArg() { if !d.NextArg() {