diff options
| author | Bryan C. Mills <bcmills@google.com> | 2023-01-13 16:43:41 -0500 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-01-27 17:13:20 +0000 |
| commit | c8c646d31bec3cbe56ecf5a26fbbd235c97cfb21 (patch) | |
| tree | 1cc085be391528ce9dca6749907db0b66008758c /src | |
| parent | a106defddac515db4d70e1cad162b88dd026deee (diff) | |
| download | go-c8c646d31bec3cbe56ecf5a26fbbd235c97cfb21.tar.xz | |
cmd/go/internal/modfetch: avoid path.Join in URL errors
path.Join collapses duplicated '/' tokens, but an HTTP URL
intentionally includes a '://' after the scheme.
This should fix the syntax of the errors seen in
https://build.golang.org/log/a17d0c7b6159ea4dad0a9e5378ab5a36ee30ce44.
Updates #52727.
Change-Id: I6e1773a7eb8b3e7e2b3ca29540c1e94a7cd2d99d
Reviewed-on: https://go-review.googlesource.com/c/go/+/461682
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Bryan Mills <bcmills@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/go/internal/modfetch/proxy.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/go/internal/modfetch/proxy.go b/src/cmd/go/internal/modfetch/proxy.go index d2374680d8..facf738cb0 100644 --- a/src/cmd/go/internal/modfetch/proxy.go +++ b/src/cmd/go/internal/modfetch/proxy.go @@ -262,7 +262,7 @@ func (p *proxyRepo) getBytes(path string) ([]byte, error) { if err != nil { // net/http doesn't add context to Body errors, so add it here. // (See https://go.dev/issue/52727.) - return b, &url.Error{Op: "read", URL: pathpkg.Join(p.redactedURL, path), Err: err} + return b, &url.Error{Op: "read", URL: strings.TrimSuffix(p.redactedURL, "/") + "/" + path, Err: err} } return b, nil } |