summaryrefslogtreecommitdiff
path: root/caddyconfig
diff options
context:
space:
mode:
Diffstat (limited to 'caddyconfig')
-rw-r--r--caddyconfig/httpcaddyfile/directives.go18
1 files changed, 7 insertions, 11 deletions
diff --git a/caddyconfig/httpcaddyfile/directives.go b/caddyconfig/httpcaddyfile/directives.go
index afa2cd4..4ab8778 100644
--- a/caddyconfig/httpcaddyfile/directives.go
+++ b/caddyconfig/httpcaddyfile/directives.go
@@ -103,20 +103,11 @@ func RegisterHandlerDirective(dir string, setupFunc UnmarshalHandlerFunc) {
return nil, h.ArgErr()
}
- matcherSet, ok, err := h.MatcherToken()
+ matcherSet, err := h.ExtractMatcherSet()
if err != nil {
return nil, err
}
- if ok {
- // strip matcher token; we don't need to
- // use the return value here because a
- // new dispenser should have been made
- // solely for this directive's tokens,
- // with no other uses of same slice
- h.Dispenser.Delete()
- }
- h.Dispenser.Reset() // pretend this lookahead never happened
val, err := setupFunc(h)
if err != nil {
return nil, err
@@ -201,7 +192,12 @@ func (h Helper) ExtractMatcherSet() (caddy.ModuleMap, error) {
return nil, err
}
if hasMatcher {
- h.Dispenser.Delete() // strip matcher token
+ // strip matcher token; we don't need to
+ // use the return value here because a
+ // new dispenser should have been made
+ // solely for this directive's tokens,
+ // with no other uses of same slice
+ h.Dispenser.Delete()
}
h.Dispenser.Reset() // pretend this lookahead never happened
return matcherSet, nil