diff options
| author | Francis Lavoie <lavofr@gmail.com> | 2020-05-11 18:41:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 16:41:11 -0600 |
| commit | ef6e53bb5f521e4d400849b79bc72e89fe2a7484 (patch) | |
| tree | d1190ba7f084ec1ec8b99a6c8ea8e30ec1dfdb21 /caddyconfig | |
| parent | 35e1d92d588fadc8e5d619ffb81319dd8f7ba43a (diff) | |
core: Add support for `d` duration unit (#3323)
* caddy: Add support for `d` duration unit
* Improvements to ParseDuration; add unit tests
Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>
Diffstat (limited to 'caddyconfig')
| -rw-r--r-- | caddyconfig/httpcaddyfile/options.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/caddyconfig/httpcaddyfile/options.go b/caddyconfig/httpcaddyfile/options.go index de288db..49a11f6 100644 --- a/caddyconfig/httpcaddyfile/options.go +++ b/caddyconfig/httpcaddyfile/options.go @@ -16,7 +16,6 @@ package httpcaddyfile import ( "strconv" - "time" "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" @@ -227,7 +226,7 @@ func parseOptOnDemand(d *caddyfile.Dispenser) (interface{}, error) { if !d.NextArg() { return nil, d.ArgErr() } - dur, err := time.ParseDuration(d.Val()) + dur, err := caddy.ParseDuration(d.Val()) if err != nil { return nil, err } |