Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-01 04:34:21 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

caddyfile: advance cursor for claimed token in NewFromNextTokens() (#2971)

Browse Source 
When we append a token to the new dispenser, we need to consume it in the parent, too; otherwise it gets scanned twice, which in this case messed up the nesting count which got decremented once too many times.
This commit is contained in:
Zaq? Wiedmann 2020-01-09 19:48:15 -08:00 committed by Matt Holt
parent 871abf1053
commit 3dcc34d341
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
caddyconfig/caddyfile/dispenser.go
View File

@ -275,6 +275,10 @@ func (d *Dispenser) NewFromNextTokens() *Dispenser {
if openedBlock { if openedBlock {
// include closing brace accordingly // include closing brace accordingly
tkns = append(tkns, d.Token()) tkns = append(tkns, d.Token())
// since NewFromNextTokens is intended to consume the entire
// directive, we must call Next() here and consume the closing
// curly brace
d.Next()
} }
return NewDispenser(tkns) return NewDispenser(tkns)
} }