diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2020-02-14 11:00:16 -0700 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2020-02-14 11:01:09 -0700 |
| commit | 15bf9c196c5972051f40ebadf50811bd06e328dd (patch) | |
| tree | 03362b73a9bdd923bf4f252e346a8441f5de04b0 /caddyconfig/httpcaddyfile/builtins.go | |
| parent | eb80165583776d878256359f1635ffa9a17f0171 (diff) | |
caddyfile: Refactor; NewFromNextSegment(); fix repeated matchers
Now multiple instances of the same matcher can be used within a named
matcher without overwriting previous ones.
Diffstat (limited to 'caddyconfig/httpcaddyfile/builtins.go')
| -rw-r--r-- | caddyconfig/httpcaddyfile/builtins.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/caddyconfig/httpcaddyfile/builtins.go b/caddyconfig/httpcaddyfile/builtins.go index bac12da..b758c39 100644 --- a/caddyconfig/httpcaddyfile/builtins.go +++ b/caddyconfig/httpcaddyfile/builtins.go @@ -368,7 +368,7 @@ func parseRoute(h Helper) (caddyhttp.MiddlewareHandler, error) { } subHelper := h - subHelper.Dispenser = h.NewFromNextTokens() + subHelper.Dispenser = h.NewFromNextSegment() results, err := dirFunc(subHelper) if err != nil { @@ -401,7 +401,7 @@ func parseHandle(h Helper) (caddyhttp.MiddlewareHandler, error) { } subHelper := h - subHelper.Dispenser = h.NewFromNextTokens() + subHelper.Dispenser = h.NewFromNextSegment() results, err := dirFunc(subHelper) if err != nil { |