diff options
author | Greg Wilkins | 2009-11-20 13:53:12 +0000 |
---|---|---|
committer | Greg Wilkins | 2009-11-20 13:53:12 +0000 |
commit | bf6faf32bb39214712ce0d758beb09f07d388bcd (patch) | |
tree | 470b704c90f640d5a4d202d8a3d3f28c3e5cae08 | |
parent | 4ee9d68709d208e09c4823ab1b5c685eb0f491dd (diff) | |
download | org.eclipse.jetty.project-bf6faf32bb39214712ce0d758beb09f07d388bcd.tar.gz org.eclipse.jetty.project-bf6faf32bb39214712ce0d758beb09f07d388bcd.tar.xz org.eclipse.jetty.project-bf6faf32bb39214712ce0d758beb09f07d388bcd.zip |
updates
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1082 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r-- | jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java | 7 | ||||
-rw-r--r-- | jetty-websocket/src/test/resources/index.html | 2 |
2 files changed, 7 insertions, 2 deletions
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 dafbcd5400..3d77440367 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 @@ -49,7 +49,8 @@ public abstract class WebSocketServlet extends HttpServlet if ("WebSocket".equals(request.getHeader("Upgrade")) && "HTTP/1.1".equals(request.getProtocol())) { - WebSocket websocket=doWebSocketConnect(request,request.getHeader("WebSocket-Protocol")); + String protocol=request.getHeader("WebSocket-Protocol"); + WebSocket websocket=doWebSocketConnect(request,protocol); if (websocket!=null) { @@ -59,6 +60,10 @@ public abstract class WebSocketServlet extends HttpServlet response.setHeader("Upgrade","WebSocket"); response.addHeader("Connection","Upgrade"); + response.addHeader("WebSocket-Origin",request.getScheme()+"://"+request.getServerName()); + response.addHeader("WebSocket-Location","ws://"+request.getHeader("Host")+request.getRequestURI()); + if (protocol!=null) + response.addHeader("WebSocket-Protocol",protocol); response.sendError(101,"Web Socket Protocol Handshake"); response.flushBuffer(); diff --git a/jetty-websocket/src/test/resources/index.html b/jetty-websocket/src/test/resources/index.html index 6d8c658c93..1a15f24e18 100644 --- a/jetty-websocket/src/test/resources/index.html +++ b/jetty-websocket/src/test/resources/index.html @@ -3,7 +3,7 @@ <script lang="javascript"> alert("testing"); - var ws = new WebSocket("ws://localhost:8080/","testp"); + var ws = new WebSocket("ws://localhost:8080/"); ws.onopen = function(evt) { |