diff --git a/VERSION.txt b/VERSION.txt index 522797db1c0..3a6994a9715 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -2,8 +2,6 @@ jetty-7.3.2-SNAPSHOT + 338819 Externally control Deployment Manager application lifecycle + Ensure generated fragment names are unique + 339187 In the OSGi manifest of the jetty-all-server aggregate, mark javax.annotation as optional - -jetty-7.3.2-SNAPSHOT + 337685 Update websocket API in preparation for draft -07 jetty-7.3.1.v20110307 7 March 2011 diff --git a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java index ce3ef693d88..ce79ccbaa02 100644 --- a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java +++ b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java @@ -59,8 +59,8 @@ public abstract class WebSocketServlet extends HttpServlet */ @Override protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - if ("WebSocket".equals(request.getHeader("Upgrade"))) + { + if ("websocket".equalsIgnoreCase(request.getHeader("Upgrade"))) { boolean hixie = request.getHeader("Sec-WebSocket-Key1")!=null;