summaryrefslogtreecommitdiff
path: root/caddyconfig/httpcaddyfile
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2019-11-04 13:43:39 -0700
committerMatthew Holt <mholt@users.noreply.github.com>2019-11-04 13:43:39 -0700
commitf5c6a8553c5b6cbf2e2a58307b78ff06282d0737 (patch)
tree4a6241de6d55274d904b93f1639b95b0405ab237 /caddyconfig/httpcaddyfile
parent263ffbfaecc5ed8b7f5071baecf51b4e9d90e7bf (diff)
Prepare for beta 9 tag
Diffstat (limited to 'caddyconfig/httpcaddyfile')
-rw-r--r--caddyconfig/httpcaddyfile/directives.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/caddyconfig/httpcaddyfile/directives.go b/caddyconfig/httpcaddyfile/directives.go
index e56d101..acdca20 100644
--- a/caddyconfig/httpcaddyfile/directives.go
+++ b/caddyconfig/httpcaddyfile/directives.go
@@ -64,8 +64,12 @@ func RegisterHandlerDirective(dir string, setupFunc UnmarshalHandlerFunc) {
return nil, err
}
if ok {
- tokens := h.Dispenser.Delete() // strip matcher token
- h.Dispenser = caddyfile.NewDispenser(tokens)
+ // 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