diff --git a/src/net/http/request.go b/src/net/http/request.go index 1fdd8a4fc7..72261a1bd5 100644 --- a/src/net/http/request.go +++ b/src/net/http/request.go @@ -22,6 +22,7 @@ import ( "net/http/httptrace" "net/textproto" "net/url" + urlpkg "net/url" "strconv" "strings" "sync" @@ -850,7 +851,7 @@ func NewRequestWithContext(ctx context.Context, method, url string, body io.Read if ctx == nil { return nil, errors.New("net/http: nil Context") } - u, err := parseURL(url) // Just url.Parse (url is shadowed for godoc). + u, err := urlpkg.Parse(url) if err != nil { return nil, err } diff --git a/src/net/http/server.go b/src/net/http/server.go index f87e339dde..ff93e59bc0 100644 --- a/src/net/http/server.go +++ b/src/net/http/server.go @@ -19,6 +19,7 @@ import ( "net" "net/textproto" "net/url" + urlpkg "net/url" "os" "path" "runtime" @@ -2065,8 +2066,7 @@ func StripPrefix(prefix string, h Handler) Handler { // Setting the Content-Type header to any value, including nil, // disables that behavior. func Redirect(w ResponseWriter, r *Request, url string, code int) { - // parseURL is just url.Parse (url is shadowed for godoc). - if u, err := parseURL(url); err == nil { + if u, err := urlpkg.Parse(url); err == nil { // If url was relative, make its path absolute by // combining with request path. // The client would probably do this for us, @@ -2120,10 +2120,6 @@ func Redirect(w ResponseWriter, r *Request, url string, code int) { } } -// parseURL is just url.Parse. It exists only so that url.Parse can be called -// in places where url is shadowed for godoc. See https://golang.org/cl/49930. -var parseURL = url.Parse - var htmlReplacer = strings.NewReplacer( "&", "&", "<", "<",