summaryrefslogtreecommitdiff
path: root/caddyconfig/httpcaddyfile
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2019-11-04 13:25:37 -0700
committerMatthew Holt <mholt@users.noreply.github.com>2019-11-04 13:25:37 -0700
commit263ffbfaecc5ed8b7f5071baecf51b4e9d90e7bf (patch)
treed1edbf94af113046f5b1331a555ac0adcb5b6381 /caddyconfig/httpcaddyfile
parentbf363f061d03f33a8301466c9c0e2a89d75542c0 (diff)
caddyfile: Fix bug with Delete
It now will delete the current token even if it is the last one
Diffstat (limited to 'caddyconfig/httpcaddyfile')
-rw-r--r--caddyconfig/httpcaddyfile/directives.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/caddyconfig/httpcaddyfile/directives.go b/caddyconfig/httpcaddyfile/directives.go
index f1ce0f1..e56d101 100644
--- a/caddyconfig/httpcaddyfile/directives.go
+++ b/caddyconfig/httpcaddyfile/directives.go
@@ -64,7 +64,8 @@ func RegisterHandlerDirective(dir string, setupFunc UnmarshalHandlerFunc) {
return nil, err
}
if ok {
- h.Dispenser.Delete() // strip matcher token
+ tokens := h.Dispenser.Delete() // strip matcher token
+ h.Dispenser = caddyfile.NewDispenser(tokens)
}
h.Dispenser.Reset() // pretend this lookahead never happened