Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[jetty-dev] small fix for websocket demo for chrome

Hi,

while playing around with the 9.1 snapshot I noticed that the shipped
 websocket examples do not work with chrome (>30).
Chrome has a stricter checking of the (sub)protocol according to the spec.

I would suggests to add the used "chat" protocol to the two demos:


diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java
index c8be36c..4607aba 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java
+++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java
@@ -31,7 +31,7 @@
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
 
-@ServerEndpoint(value="/javax.websocket/")
+@ServerEndpoint(value="/javax.websocket/", subprotocols="chat")
 public class JavaxWebSocketChat
 {
     private static final List<JavaxWebSocketChat> members = new CopyOnWriteArrayList<>();
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/WebSocketChatServlet.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/WebSocketChatServlet.java
index 1f9f385..b7232e2 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/WebSocketChatServlet.java
+++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/WebSocketChatServlet.java
@@ -73,6 +73,7 @@
     @Override
     public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp)
     {
+        resp.setAcceptedSubProtocol("chat");
         return new ChatWebSocket();
     }
 

BR,
Andreas


Back to the top