mirror of
https://github.com/jetty/jetty.project.git
synced 2025-02-19 04:55:01 +00:00
Conflicts: jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD00Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD06Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD08Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java