serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-03 17:43:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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 return false
} }
d.Next() d.Next()
if d.Val() == "}" {
// Open and then closed right away
return false
}
d.nesting++ d.nesting++
return true 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, 3, 1)
assertNextBlock(true, 4, 1) assertNextBlock(true, 4, 1)
assertNextBlock(false, 5, 0) assertNextBlock(false, 5, 0)
d.Next() // foobar2 d.Next() // foobar2
assertNextBlock(true, 8, 1) assertNextBlock(false, 8, 0) // empty block is as if it didn't exist
assertNextBlock(false, 8, 0)
} }
func TestDispenser_Args(t *testing.T) { func TestDispenser_Args(t *testing.T) {