Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-30 22:34:15 -05:00
Code Issues Activity

reverseproxy: Fix incorrect health_headers Caddyfile parsing (#4485)

Browse source 
Fixes #4481
This commit is contained in:
Francis Lavoie 2021-12-17 10:53:11 -05:00 committed by GitHub
parent 180ae0cc48
commit 5333c3528b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
caddytest/integration/caddyfile_adapt/reverse_proxy_health_headers.txt
View file

@ -7,6 +7,7 @@ reverse_proxy 127.0.0.1:65535 {
X-Header-Keys VbG4NZwWnipo 335Q9/MhqcNU3s2TO X-Header-Keys VbG4NZwWnipo 335Q9/MhqcNU3s2TO
X-Empty-Value X-Empty-Value
} }
health_uri /health
} }
---------- ----------
{ {
@ -38,7 +39,8 @@ reverse_proxy 127.0.0.1:65535 {
"VbG4NZwWnipo", "VbG4NZwWnipo",
"335Q9/MhqcNU3s2TO" "335Q9/MhqcNU3s2TO"
] ]
} },
"uri": "/health"
} }
}, },
"upstreams": [ "upstreams": [

14
modules/caddyhttp/reverseproxy/caddyfile.go
View file

@ -361,15 +361,13 @@ func (h *Handler) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
case "health_headers": case "health_headers":
healthHeaders := make(http.Header) healthHeaders := make(http.Header)
for d.Next() { for nesting := d.Nesting(); d.NextBlock(nesting); {
for d.NextBlock(0) { key := d.Val()
key := d.Val() values := d.RemainingArgs()
values := d.RemainingArgs() if len(values) == 0 {
if len(values) == 0 { values = append(values, "")
values = append(values, "")
}
healthHeaders[key] = values
} }
healthHeaders[key] = values
} }
if h.HealthChecks == nil { if h.HealthChecks == nil {
h.HealthChecks = new(HealthChecks) h.HealthChecks = new(HealthChecks)