github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-23 21:52:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

NextBlock() doesn't enter an empty block

Browse Source
This commit is contained in:
Matthew Holt 2015-05-07 13:10:00 -06:00
parent 2ce5102473
commit 0dba8d406b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/parse/dispenser.go
View File

@ -109,6 +109,10 @@ func (d *Dispenser) NextBlock() bool {
return false
}
d.Next()
if d.Val() == "}" {
// Open and then closed right away
return false
}
d.nesting++
return true
}

5
config/parse/dispenser_test.go
View File

@ -149,9 +149,8 @@ func TestDispenser_NextBlock(t *testing.T) {
assertNextBlock(true, 3, 1)
assertNextBlock(true, 4, 1)
assertNextBlock(false, 5, 0)
d.Next() // foobar2
assertNextBlock(true, 8, 1)
assertNextBlock(false, 8, 0)
d.Next() // foobar2
assertNextBlock(false, 8, 0) // empty block is as if it didn't exist
}
func TestDispenser_Args(t *testing.T) {