From: Shenghou Ma <minux.ma@gmail.com>
Date: Thu, 17 Jan 2013 10:50:49 +0000 (+0800)
Subject: cmd/godoc: when redirecting don't clear query string
X-Git-Tag: go1.1rc2~1376
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c2aee3c0bf7b4199d71970df5557b28b53afae4f;p=gostls13.git

cmd/godoc: when redirecting don't clear query string
so that http://golang.org/pkg/runtime?m=all works.

R=bradfitz
CC=golang-dev
https://golang.org/cl/7094046
---

diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go
index 12148ec1cd..54cd8ef2d5 100644
--- a/src/cmd/godoc/godoc.go
+++ b/src/cmd/godoc/godoc.go
@@ -656,7 +656,9 @@ func redirect(w http.ResponseWriter, r *http.Request) (redirected bool) {
 		canonical += "/"
 	}
 	if r.URL.Path != canonical {
-		http.Redirect(w, r, canonical, http.StatusMovedPermanently)
+		url := *r.URL
+		url.Path = canonical
+		http.Redirect(w, r, url.String(), http.StatusMovedPermanently)
 		redirected = true
 	}
 	return
@@ -668,7 +670,9 @@ func redirectFile(w http.ResponseWriter, r *http.Request) (redirected bool) {
 		c = c[:len(c)-1]
 	}
 	if r.URL.Path != c {
-		http.Redirect(w, r, c, http.StatusMovedPermanently)
+		url := *r.URL
+		url.Path = c
+		http.Redirect(w, r, url.String(), http.StatusMovedPermanently)
 		redirected = true
 	}
 	return