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

Remove ineffectual assignment created by reverting 344017d (#1584)

Browse Source
This commit is contained in:
Matthew Holt 2017-04-21 22:26:38 -06:00
parent 0a798aafac
commit f09fff3d8b
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
caddyhttp/proxy/reverseproxy.go
View File

@ -25,7 +25,6 @@ import (
"golang.org/x/net/http2" "golang.org/x/net/http2"
"github.com/mholt/caddy/caddyhttp/httpserver" "github.com/mholt/caddy/caddyhttp/httpserver"
"github.com/mholt/caddy/caddyhttp/staticfiles"
) )
var ( var (
@ -121,7 +120,8 @@ func NewSingleHostReverseProxy(target *url.URL, without string, keepalive int) *
} }
// We should remove the `without` prefix at first. // We should remove the `without` prefix at first.
untouchedPath, _ := req.Context().Value(staticfiles.URLPathCtxKey).(string) // TODO(mholt): See #1582 (and below)
// untouchedPath, _ := req.Context().Value(staticfiles.URLPathCtxKey).(string)
if without != "" { if without != "" {
req.URL.Path = strings.TrimPrefix(req.URL.Path, without) req.URL.Path = strings.TrimPrefix(req.URL.Path, without)
if req.URL.Opaque != "" { if req.URL.Opaque != "" {
@ -130,9 +130,10 @@ func NewSingleHostReverseProxy(target *url.URL, without string, keepalive int) *
if req.URL.RawPath != "" { if req.URL.RawPath != "" {
req.URL.RawPath = strings.TrimPrefix(req.URL.RawPath, without) req.URL.RawPath = strings.TrimPrefix(req.URL.RawPath, without)
} }
if untouchedPath != "" { // TODO(mholt): See #1582 (and above)
untouchedPath = strings.TrimPrefix(untouchedPath, without) // if untouchedPath != "" {
} // untouchedPath = strings.TrimPrefix(untouchedPath, without)
// }
} }
// prefer returns val if it isn't empty, otherwise def // prefer returns val if it isn't empty, otherwise def