Commit 9b6069bf authored by Shenghou Ma's avatar Shenghou Ma Committed by Minux Ma

net/url: fix mentions of URL.EscapedPath method

Fixes #12862.

Change-Id: I6921ae31bd5515f344fd97d08eafc317228b98a0
Reviewed-on: https://go-review.googlesource.com/15590Reviewed-by: 's avatarAndrew Gerrand <adg@golang.org>
parent 9238cbd5
...@@ -264,7 +264,7 @@ func escape(s string, mode encoding) string { ...@@ -264,7 +264,7 @@ func escape(s string, mode encoding) string {
// Go 1.5 introduced the RawPath field to hold the encoded form of Path. // Go 1.5 introduced the RawPath field to hold the encoded form of Path.
// The Parse function sets both Path and RawPath in the URL it returns, // The Parse function sets both Path and RawPath in the URL it returns,
// and URL's String method uses RawPath if it is a valid encoding of Path, // and URL's String method uses RawPath if it is a valid encoding of Path,
// by calling the EncodedPath method. // by calling the EscapedPath method.
// //
// In earlier versions of Go, the more indirect workarounds were that an // In earlier versions of Go, the more indirect workarounds were that an
// HTTP server could consult req.RequestURI and an HTTP client could // HTTP server could consult req.RequestURI and an HTTP client could
...@@ -449,7 +449,7 @@ func parse(rawurl string, viaRequest bool) (url *URL, err error) { ...@@ -449,7 +449,7 @@ func parse(rawurl string, viaRequest bool) (url *URL, err error) {
goto Error goto Error
} }
// RawPath is a hint as to the encoding of Path to use // RawPath is a hint as to the encoding of Path to use
// in url.EncodedPath. If that method already gets the // in url.EscapedPath. If that method already gets the
// right answer without RawPath, leave it empty. // right answer without RawPath, leave it empty.
// This will help make sure that people don't rely on it in general. // This will help make sure that people don't rely on it in general.
if url.EscapedPath() != rest && validEncodedPath(rest) { if url.EscapedPath() != rest && validEncodedPath(rest) {
...@@ -614,7 +614,7 @@ func validOptionalPort(port string) bool { ...@@ -614,7 +614,7 @@ func validOptionalPort(port string) bool {
// //
// If u.Opaque is non-empty, String uses the first form; // If u.Opaque is non-empty, String uses the first form;
// otherwise it uses the second form. // otherwise it uses the second form.
// To obtain the path, String uses u.EncodedPath(). // To obtain the path, String uses u.EscapedPath().
// //
// In the second form, the following rules apply: // In the second form, the following rules apply:
// - if u.Scheme is empty, scheme: is omitted. // - if u.Scheme is empty, scheme: is omitted.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment