From: bronze1man <bronze1man@gmail.com>
Date: Mon, 14 Jan 2019 15:41:02 +0000 (+0000)
Subject: net/http: remove unnecessary string replace operation in Cookie.String
X-Git-Tag: go1.13beta1~692
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=09b2b6e9dd2ce009c3aafdff02727f200c63c574;p=gostls13.git

net/http: remove unnecessary string replace operation in Cookie.String

Fixes #29135

Change-Id: I4c10b0395047775e8488b8b0f00f74a7fa01b86c
GitHub-Last-Rev: 120977040506794f00c74383289f913b1e0edd4a
GitHub-Pull-Request: golang/go#29728
Reviewed-on: https://go-review.googlesource.com/c/go/+/157777
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/http/cookie.go b/src/net/http/cookie.go
index 7d02796f30..fd8c71c645 100644
--- a/src/net/http/cookie.go
+++ b/src/net/http/cookie.go
@@ -173,7 +173,7 @@ func (c *Cookie) String() string {
 	const extraCookieLength = 110
 	var b strings.Builder
 	b.Grow(len(c.Name) + len(c.Value) + len(c.Domain) + len(c.Path) + extraCookieLength)
-	b.WriteString(sanitizeCookieName(c.Name))
+	b.WriteString(c.Name)
 	b.WriteRune('=')
 	b.WriteString(sanitizeCookieValue(c.Value))
 
diff --git a/src/net/http/cookie_test.go b/src/net/http/cookie_test.go
index 9536a69c20..bfaea46f8c 100644
--- a/src/net/http/cookie_test.go
+++ b/src/net/http/cookie_test.go
@@ -127,6 +127,22 @@ var writeSetCookiesTests = []struct {
 		&Cookie{Name: "\t"},
 		``,
 	},
+	{
+		&Cookie{Name: "\r"},
+		``,
+	},
+	{
+		&Cookie{Name: "a\nb", Value: "v"},
+		``,
+	},
+	{
+		&Cookie{Name: "a\nb", Value: "v"},
+		``,
+	},
+	{
+		&Cookie{Name: "a\rb", Value: "v"},
+		``,
+	},
 }
 
 func TestWriteSetCookies(t *testing.T) {