Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

337685 testing with FF 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2879 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2011-03-11 04:10:12 +00:00
parent 6cbd1225a6
commit 3078c8797e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -2,8 +2,6 @@ jetty-7.3.2-SNAPSHOT
+ 338819 Externally control Deployment Manager application lifecycle + 338819 Externally control Deployment Manager application lifecycle
+ Ensure generated fragment names are unique + Ensure generated fragment names are unique
+ 339187 In the OSGi manifest of the jetty-all-server aggregate, mark javax.annotation as optional + 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 + 337685 Update websocket API in preparation for draft -07
jetty-7.3.1.v20110307 7 March 2011 jetty-7.3.1.v20110307 7 March 2011

2
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java
View File

@ -60,7 +60,7 @@ public abstract class WebSocketServlet extends HttpServlet
@Override @Override
protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException 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; boolean hixie = request.getHeader("Sec-WebSocket-Key1")!=null;