Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-10-14 02:44:52 +0000
committerGreg Wilkins2013-10-14 02:44:52 +0000
commita3424532e8499742fedfe31035e20607648633d4 (patch)
treee6d5454bb90144da90afbbb5e712ac0cbbdea72e /jetty-websocket/websocket-api/src
parentdefa3a04cfd2669d6f9fb46df18479a3ebb7569d (diff)
downloadorg.eclipse.jetty.project-a3424532e8499742fedfe31035e20607648633d4.tar.gz
org.eclipse.jetty.project-a3424532e8499742fedfe31035e20607648633d4.tar.xz
org.eclipse.jetty.project-a3424532e8499742fedfe31035e20607648633d4.zip
fixed bad merge
Diffstat (limited to 'jetty-websocket/websocket-api/src')
-rw-r--r--jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java10
1 files changed, 0 insertions, 10 deletions
diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java
index 7b88670b40..8729131d34 100644
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java
@@ -198,16 +198,6 @@ public class UpgradeRequest
return version;
}
- public String getProtocolVersion()
- {
- String version = getHeader("Sec-WebSocket-Version");
- if (version == null)
- {
- return "13";
- }
- return version;
- }
-
public String getQueryString()
{
return requestURI.getQuery();

Back to the top