Use tokenContainsValue instead of just equalASCIFold

fasthttp · Jan 4, 2020 · 41f3051 · 41f3051
1 parent f15f64d
commit 41f3051
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/server_fasthttp.go b/server_fasthttp.go
@@ -139,11 +139,11 @@ func (u *FastHTTPUpgrader) Upgrade(ctx *fasthttp.RequestCtx, handler FastHTTPHan
 		return u.responseError(ctx, fasthttp.StatusMethodNotAllowed, fmt.Sprintf("%s request method is not GET", badHandshake))
 	}
 
-	if !equalASCIIFold(gotils.B2S(ctx.Request.Header.Peek("Connection")), "Upgrade") {
+	if !tokenContainsValue(gotils.B2S(ctx.Request.Header.Peek("Connection")), "Upgrade") {
 		return u.responseError(ctx, fasthttp.StatusBadRequest, fmt.Sprintf("%s 'upgrade' token not found in 'Connection' header", badHandshake))
 	}
 
-	if !equalASCIIFold(gotils.B2S(ctx.Request.Header.Peek("Upgrade")), "Websocket") {
+	if !tokenContainsValue(gotils.B2S(ctx.Request.Header.Peek("Upgrade")), "Websocket") {
 		return u.responseError(ctx, fasthttp.StatusBadRequest, fmt.Sprintf("%s 'websocket' token not found in 'Upgrade' header", badHandshake))
 	}
 
@@ -224,6 +224,6 @@ func fastHTTPcheckSameOrigin(ctx *fasthttp.RequestCtx) bool {
 // FastHTTPIsWebSocketUpgrade returns true if the client requested upgrade to the
 // WebSocket protocol.
 func FastHTTPIsWebSocketUpgrade(ctx *fasthttp.RequestCtx) bool {
-	return equalASCIIFold(gotils.B2S(ctx.Request.Header.Peek("Connection")), "Upgrade") &&
-		equalASCIIFold(gotils.B2S(ctx.Request.Header.Peek("Upgrade")), "Websocket")
+	return tokenContainsValue(gotils.B2S(ctx.Request.Header.Peek("Connection")), "Upgrade") &&
+		tokenContainsValue(gotils.B2S(ctx.Request.Header.Peek("Upgrade")), "Websocket")
 }