Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--VERSION.txt1
-rw-r--r--jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/VERSION.txt b/VERSION.txt
index bca97f826a..ba8b6641e2 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,6 +1,7 @@
jetty-SNAPSHOT
+ 308866 Update test suite to JUnit4 - Module jetty-util
+ 313196 randomly allocate ports for session test.
+ + 313336 secure websockets
+ Update links to jetty website and wiki on test webapp
jetty-7.1.1.v20100517
diff --git a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
index 6ebd208765..c69136bc00 100644
--- a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
+++ b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
@@ -98,7 +98,7 @@ public class WebSocketFactory
response.setHeader("Upgrade","WebSocket");
response.addHeader("Connection","Upgrade");
response.addHeader("WebSocket-Origin",origin);
- response.addHeader("WebSocket-Location","ws://"+host+uri);
+ response.addHeader("WebSocket-Location",(request.isSecure()?"wss://":"ws://")+host+uri);
if (protocol!=null)
response.addHeader("WebSocket-Protocol",protocol);
response.sendError(101,"Web Socket Protocol Handshake");

Back to the top