github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-22 13:11:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2443 from maxheyer/master

Browse Source 
Add header X-Forwarded-Port to preset transparent
This commit is contained in:
Abiola Ibrahim 2019-01-26 08:30:12 +01:00 committed by GitHub
commit fdec3c68f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
caddyhttp/proxy/upstream.go
View File

@ -448,6 +448,7 @@ func parseBlock(c *caddyfile.Dispenser, u *staticUpstream, hasSrv bool) error {
u.upstreamHeaders.Add("Host", "{host}") u.upstreamHeaders.Add("Host", "{host}")
u.upstreamHeaders.Add("X-Real-IP", "{remote}") u.upstreamHeaders.Add("X-Real-IP", "{remote}")
u.upstreamHeaders.Add("X-Forwarded-Proto", "{scheme}") u.upstreamHeaders.Add("X-Forwarded-Proto", "{scheme}")
u.upstreamHeaders.Add("X-Forwarded-Port", "{server_port}")
case "websocket": case "websocket":
u.upstreamHeaders.Add("Connection", "{>Connection}") u.upstreamHeaders.Add("Connection", "{>Connection}")
u.upstreamHeaders.Add("Upgrade", "{>Upgrade}") u.upstreamHeaders.Add("Upgrade", "{>Upgrade}")

4
caddyhttp/proxy/upstream_test.go
View File

@ -321,6 +321,10 @@ func TestParseBlockTransparent(t *testing.T) {
if _, ok := headers["X-Forwarded-For"]; ok { if _, ok := headers["X-Forwarded-For"]; ok {
t.Errorf("Test %d: Found unexpected X-Forwarded-For header", i+1) t.Errorf("Test %d: Found unexpected X-Forwarded-For header", i+1)
} }
if _, ok := headers["X-Forwarded-Port"]; !ok {
t.Errorf("Test %d: Could not find the X-Forwarded-Port header", i+1)
}
} }
} }
} }