From 50e62d06bcbc6b6486b382a22c633772443cfb6d Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Mon, 9 Sep 2019 12:23:27 -0600 Subject: reverse_proxy: Caddyfile integration (and fix blocks in Dispenser) --- caddyconfig/caddyfile/dispenser.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'caddyconfig') diff --git a/caddyconfig/caddyfile/dispenser.go b/caddyconfig/caddyfile/dispenser.go index 93f451e..938c985 100755 --- a/caddyconfig/caddyfile/dispenser.go +++ b/caddyconfig/caddyfile/dispenser.go @@ -236,18 +236,13 @@ func (d *Dispenser) NewFromNextTokens() *Dispenser { for d.NextArg() { tkns = append(tkns, d.Token()) } - if d.Next() && d.Val() == "{" { - tkns = append(tkns, d.Token()) - for d.NextBlock() { - for d.Nested() { - tkns = append(tkns, d.Token()) - d.NextBlock() - } + for d.NextBlock() { + for d.Nested() { + tkns = append(tkns, d.Token()) + d.NextBlock() } - tkns = append(tkns, d.Token()) - } else { - d.cursor-- } + tkns = append(tkns, d.Token()) return NewDispenser(tkns) } -- cgit v1.2.3