Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2016-01-15 15:23:06 -0500
committerJoakim Erdfelt2016-01-15 15:23:43 -0500
commit9f8df9a1a84433cdaf4b52471210f63d6e005f2d (patch)
tree7194f257a77cd777c935306de749e0aa1cb183dd /jetty-websocket/javax-websocket-server-impl
parentd41c0bba65d7b95ef5d80270b84010e67c5f94c8 (diff)
downloadorg.eclipse.jetty.project-9f8df9a1a84433cdaf4b52471210f63d6e005f2d.tar.gz
org.eclipse.jetty.project-9f8df9a1a84433cdaf4b52471210f63d6e005f2d.tar.xz
org.eclipse.jetty.project-9f8df9a1a84433cdaf4b52471210f63d6e005f2d.zip
485969 - WebSocket upgrade response should honor HttpConfiguration server version settings
Diffstat (limited to 'jetty-websocket/javax-websocket-server-impl')
-rw-r--r--jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserDebugTool.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserDebugTool.java b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserDebugTool.java
index 691a41a757..ce8d230bbb 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserDebugTool.java
+++ b/jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/browser/JsrBrowserDebugTool.java
@@ -21,6 +21,8 @@ package org.eclipse.jetty.websocket.jsr356.server.browser;
import javax.servlet.ServletException;
import javax.websocket.DeploymentException;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.DefaultServlet;
@@ -79,7 +81,11 @@ public class JsrBrowserDebugTool
private void setupServer(int port) throws DeploymentException, ServletException
{
server = new Server();
- ServerConnector connector = new ServerConnector(server);
+
+ HttpConfiguration httpConf = new HttpConfiguration();
+ httpConf.setSendServerVersion(true);
+
+ ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(httpConf));
connector.setPort(port);
server.addConnector(connector);

Back to the top