serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-07 11:28:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1238 from tw4452852/1234

Browse source 
proxy: make sure value is optional when removing a header
This commit is contained in:
Matt Holt 2016-11-03 12:13:39 -06:00 committed by GitHub
commit e19a007b38
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
caddyhttp/proxy/setup_test.go
View file

@ -131,6 +131,22 @@ func TestSetup(t *testing.T) {
"http://localhost:8005/a--b": {},
},
},
// test #12 test value is optional when remove upstream header
{
"proxy / localhost:1984 {\n header_upstream -server \n}",
false,
map[string]struct{}{
"http://localhost:1984": {},
},
},
// test #13 test value is optional when remove downstream header
{
"proxy / localhost:1984 {\n header_downstream -server \n}",
false,
map[string]struct{}{
"http://localhost:1984": {},
},
},
} {
c := caddy.NewTestController("http", test.input)
err := setup(c)

10
caddyhttp/proxy/upstream.go
View file

@ -305,13 +305,19 @@ func parseBlock(c *caddyfile.Dispenser, u *staticUpstream) error {
case "header_upstream":
var header, value string
if !c.Args(&header, &value) {
return c.ArgErr()
// When removing a header, the value can be optional.
if !strings.HasPrefix(header, "-") {
return c.ArgErr()
}
}
u.upstreamHeaders.Add(header, value)
case "header_downstream":
var header, value string
if !c.Args(&header, &value) {
return c.ArgErr()
// When removing a header, the value can be optional.
if !strings.HasPrefix(header, "-") {
return c.ArgErr()
}
}
u.downstreamHeaders.Add(header, value)
case "transparent":