From 15bf9c196c5972051f40ebadf50811bd06e328dd Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Fri, 14 Feb 2020 11:00:16 -0700 Subject: caddyfile: Refactor; NewFromNextSegment(); fix repeated matchers Now multiple instances of the same matcher can be used within a named matcher without overwriting previous ones. --- caddyconfig/httpcaddyfile/builtins.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'caddyconfig/httpcaddyfile/builtins.go') 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 { -- cgit v1.2.3