From: Kunpei Sakai <namusyaka@gmail.com>
Date: Fri, 8 Sep 2017 15:39:20 +0000 (+0900)
Subject: net/url: don't escape sub-delims in fragment
X-Git-Tag: go1.11beta2~117
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8a330454dc1502091dba2c890f5f6d0c095034de;p=gostls13.git

net/url: don't escape sub-delims in fragment

According to RFC-3986, the sub-delims chars should not be escaped in
fragment.
So this change fixes current behavior a bit.

Fixes #19917

Change-Id: I1a8deb93255d979532f75bae183c3fb53a05d395
Reviewed-on: https://go-review.googlesource.com/61650
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/net/url/url.go b/src/net/url/url.go
index 6608dbd74a..80eb7a86c8 100644
--- a/src/net/url/url.go
+++ b/src/net/url/url.go
@@ -158,6 +158,19 @@ func shouldEscape(c byte, mode encoding) bool {
 		}
 	}
 
+	if mode == encodeFragment {
+		// RFC 3986 §2.2 allows not escaping sub-delims. A subset of sub-delims are
+		// included in reserved from RFC 2396 §2.2. The remaining sub-delims do not
+		// need to be escaped. To minimize potential breakage, we apply two restrictions:
+		// (1) we always escape sub-delims outside of the fragment, and (2) we always
+		// escape single quote to avoid breaking callers that had previously assumed that
+		// single quotes would be escaped. See issue #19917.
+		switch c {
+		case '!', '(', ')', '*':
+			return false
+		}
+	}
+
 	// Everything else must be escaped.
 	return true
 }
diff --git a/src/net/url/url_test.go b/src/net/url/url_test.go
index 7f03d2b9de..9043a844e8 100644
--- a/src/net/url/url_test.go
+++ b/src/net/url/url_test.go
@@ -1075,6 +1075,7 @@ var resolveReferenceTests = []struct {
 
 	// Fragment
 	{"http://foo.com/bar", ".#frag", "http://foo.com/#frag"},
+	{"http://example.org/", "#!$&%27()*+,;=", "http://example.org/#!$&%27()*+,;="},
 
 	// Paths with escaping (issue 16947).
 	{"http://foo.com/foo%2fbar/", "../baz", "http://foo.com/baz"},