github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-29 12:16:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1173

Browse Source
This commit is contained in:
Matt Holt 2016-10-13 22:56:19 -06:00 committed by GitHub
commit 550b1170bd
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
caddyhttp/proxy/proxy_test.go
View File

@ -824,6 +824,11 @@ func TestProxyDirectorURL(t *testing.T) {
expectURL: `https://localhost:2021/t?foo%3dbar&t%3dw`,
without: "/test",
},
{
requestURL: `http://localhost:2020/test/`,
targetURL: `https://localhost:2021/t/`,
expectURL: `https://localhost:2021/t/test/`,
},
} {
targetURL, err := url.Parse(c.targetURL)
if err != nil {

6
caddyhttp/proxy/reverseproxy.go
View File

@ -98,7 +98,13 @@ func NewSingleHostReverseProxy(target *url.URL, without string, keepalive int) *
}
}
hadTrailingSlash := strings.HasSuffix(req.URL.Path, "/")
req.URL.Path = path.Join(target.Path, req.URL.Path)
// path.Join will strip off the last /, so put it back if it was there.
if hadTrailingSlash && !strings.HasSuffix(req.URL.Path, "/") {
req.URL.Path = req.URL.Path + "/"
}
// Trims the path of the socket from the URL path.
// This is done because req.URL passed to your proxied service
// will have the full path of the socket file prefixed to it.