Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · Jan 11, 2024 · b129033 · b129033
1 parent ea5db96
commit b129033
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/CrossOriginHandler.java b/...-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/CrossOriginHandler.java
@@ -446,7 +446,7 @@ private boolean isPreflight(Request request)
 
     private boolean isWebSocketUpgrade(Request request)
     {
-        return request.getHeaders().contains(HttpHeader.SEC_WEBSOCKET_VERSION, "13");
+        return request.getHeaders().contains(HttpHeader.SEC_WEBSOCKET_VERSION);
     }
 
     private void handlePreflightResponse(String origins, Response response)

diff --git a/...e/jetty-server/src/test/java/org/eclipse/jetty/server/handler/CrossOriginHandlerTest.java b/...e/jetty-server/src/test/java/org/eclipse/jetty/server/handler/CrossOriginHandlerTest.java
@@ -561,6 +561,7 @@ public void testDeliverWebSocketUpgradeRequest() throws Exception
             Host: localhost\r
             Connection: Upgrade\r
             Upgrade: websocket\r
+            Sec-WebSocket-Version: 13\r
             Origin: http://localhost\r
             \r
             """;
@@ -587,6 +588,7 @@ public void testDoNotDeliverNonMatchingWebSocketUpgradeRequest() throws Exceptio
             Host: localhost\r
             Connection: Upgrade\r
             Upgrade: websocket\r
+            Sec-WebSocket-Version: 13
             Origin: http://127.0.0.1\r
             \r
             """;