Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
reverseproxy: Accept integer values for flush_interval (fix #2996)
Matthew Holt committed
Jan 22, 2020 at 09:34 UTC
5b878d5bd36a6628095997c4f32e7df5366621f7
1 file changed
+9
-5
modules/caddyhttp/reverseproxy/caddyfile.go
+9
-5
@@ -335,11 +335,15 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
335
if !d.NextArg() {
336
return d.ArgErr()
337
}
338
- dur, err := time.ParseDuration(d.Val())
339
- if err != nil {
340
- return d.Errf("bad duration value '%s': %v", d.Val(), err)
338
+ if fi, err := strconv.Atoi(d.Val()); err == nil {
339
+ h.FlushInterval = caddy.Duration(fi)
340
+ } else {
341
+ dur, err := time.ParseDuration(d.Val())
342
+ if err != nil {
343
+ return d.Errf("bad duration value '%s': %v", d.Val(), err)
344
+ }
345
+ h.FlushInterval = caddy.Duration(dur)
346
}
342
- h.FlushInterval = caddy.Duration(dur)
347
348
case "header_up":
349
if h.Headers == nil {
@@ -511,7 +515,7 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
515
h.TLS = new(TLSConfig)
516
}
517
514
- h.TLS.RootCAPemFiles = args
518
+ h.TLS.RootCAPEMFiles = args
519
520
case "keepalive":
521
if !d.NextArg() {