github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-23 01:40:09 +08:00
Code Issues Actions Packages Projects Releases 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

14
modules/caddyhttp/reverseproxy/caddyfile.go
View File

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