aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorSean Liao <seankhliao@gmail.com>2021-10-13 23:58:54 +0200
committerJamal Carvalho <jamal@golang.org>2021-11-09 19:42:11 +0000
commit7f7afedada6144735bb4ed62960c8e4227fe7dfa (patch)
treec70304a6fe2b1395c5ef8580832aa42a169c41cc /cmd
parent2795752c7d01534ba9a81858149579765ffb98f8 (diff)
downloadgo-x-website-7f7afedada6144735bb4ed62960c8e4227fe7dfa.tar.xz
cmd/golangorg: redirect /x/ to pkgsite subrepo page
For golang/go#47281 Change-Id: I065e6cb1d301701304228a3e4f263f3e576f8cbe Reviewed-on: https://go-review.googlesource.com/c/website/+/355809 Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Jamal Carvalho <jamal@golang.org> Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Trust: Jamal Carvalho <jamal@golang.org>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/golangorg/server.go4
-rw-r--r--cmd/golangorg/testdata/x.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/golangorg/server.go b/cmd/golangorg/server.go
index b1a9d04e..0e396acd 100644
--- a/cmd/golangorg/server.go
+++ b/cmd/golangorg/server.go
@@ -491,7 +491,7 @@ func loggingHandler(h http.Handler) http.Handler {
func xHandler(w http.ResponseWriter, r *http.Request) {
if !strings.HasPrefix(r.URL.Path, "/x/") {
// Shouldn't happen if handler is registered correctly.
- http.Redirect(w, r, "https://pkg.go.dev/search?q=golang.org/x", http.StatusTemporaryRedirect)
+ http.Redirect(w, r, "https://pkg.go.dev/golang.org/x", http.StatusTemporaryRedirect)
return
}
proj, suffix := strings.TrimPrefix(r.URL.Path, "/x/"), ""
@@ -499,7 +499,7 @@ func xHandler(w http.ResponseWriter, r *http.Request) {
proj, suffix = proj[:i], proj[i:]
}
if proj == "" {
- http.Redirect(w, r, "https://pkg.go.dev/search?q=golang.org/x", http.StatusTemporaryRedirect)
+ http.Redirect(w, r, "https://pkg.go.dev/golang.org/x", http.StatusTemporaryRedirect)
return
}
repo, ok := repos.ByGerritProject[proj]
diff --git a/cmd/golangorg/testdata/x.txt b/cmd/golangorg/testdata/x.txt
index 29d7d491..5645023c 100644
--- a/cmd/golangorg/testdata/x.txt
+++ b/cmd/golangorg/testdata/x.txt
@@ -19,7 +19,7 @@ code == 404
GET https://golang.org/x/
code == 307
-header location == https://pkg.go.dev/search?q=golang.org/x
+header location == https://pkg.go.dev/golang.org/x
GET https://golang.org/x/In%20Valid,X
code == 404