From bf363f061d03f33a8301466c9c0e2a89d75542c0 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Mon, 4 Nov 2019 12:54:46 -0700
Subject: reverse_proxy: Add UnmarshalCaddyfile for random_choose selection
 policy

Also allow caddy.Duration to be given integer values which are treated
like regular time.Duration values (nanoseconds).

Fixes #2856
---
 caddy.go | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'caddy.go')

diff --git a/caddy.go b/caddy.go
index 7aab8d4..b4acde3 100644
--- a/caddy.go
+++ b/caddy.go
@@ -437,12 +437,18 @@ type Duration time.Duration
 
 // UnmarshalJSON satisfies json.Unmarshaler.
 func (d *Duration) UnmarshalJSON(b []byte) error {
-	dd, err := time.ParseDuration(strings.Trim(string(b), `"`))
-	if err != nil {
-		return err
+	if len(b) == 0 {
+		return io.EOF
 	}
-	*d = Duration(dd)
-	return nil
+	var dur time.Duration
+	var err error
+	if b[0] == byte('"') && b[len(b)-1] == byte('"') {
+		dur, err = time.ParseDuration(strings.Trim(string(b), `"`))
+	} else {
+		err = json.Unmarshal(b, &dur)
+	}
+	*d = Duration(dur)
+	return err
 }
 
 // GoModule returns the build info of this Caddy
-- 
cgit v1.2.3