Fix bug in headerTokens

nhooyr · nhooyr · commit 7eb511956b17 · 2020-02-16T18:50:14.000-05:00
Closes #189
diff --git a/accept.go b/accept.go
@@ -325,6 +325,7 @@ func headerTokens(h http.Header, key string) []string {
 		v = strings.TrimSpace(v)
 		for _, t := range strings.Split(v, ",") {
 			t = strings.ToLower(t)
+			t = strings.TrimSpace(t)
 			tokens = append(tokens, t)
 		}
 	}
diff --git a/accept_test.go b/accept_test.go
@@ -155,7 +155,7 @@ func Test_verifyClientHandshake(t *testing.T) {
 		{
 			name: "success",
 			h: map[string]string{
-				"Connection":            "Upgrade",
+				"Connection":            "keep-alive, Upgrade",
 				"Upgrade":               "websocket",
 				"Sec-WebSocket-Version": "13",
 				"Sec-WebSocket-Key":     "meow123",

Original file line number	Diff line number	Diff line change
`@@ -325,6 +325,7 @@ func headerTokens(h http.Header, key string) []string {`
`325`	`325`	`v = strings.TrimSpace(v)`
`326`	`326`	`for _, t := range strings.Split(v, ",") {`
`327`	`327`	`t = strings.ToLower(t)`
	`328`	`+ t = strings.TrimSpace(t)`
`328`	`329`	`tokens = append(tokens, t)`
`329`	`330`	`}`
`330`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func Test_verifyClientHandshake(t *testing.T) {`
`155`	`155`	`{`
`156`	`156`	`name: "success",`
`157`	`157`	`h: map[string]string{`
`158`		`- "Connection": "Upgrade",`
	`158`	`+ "Connection": "keep-alive, Upgrade",`
`159`	`159`	`"Upgrade": "websocket",`
`160`	`160`	`"Sec-WebSocket-Version": "13",`
`161`	`161`	`"Sec-WebSocket-Key": "meow123",`