Merge remote-tracking branch 'origin/jetty-9.4.x'

joakime · joakime · commit 79b822339c39 · 2017-05-31T06:18:40.000-07:00
diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/util/WSURI.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/util/WSURI.java
@@ -120,7 +120,7 @@ public static URI toWebsocket(final URI inputUri) throws URISyntaxException
         if ("ws".equalsIgnoreCase(httpScheme) || "wss".equalsIgnoreCase(httpScheme))
         {
             // keep as-is
-            return new URI(inputUri.toString());
+            return inputUri;
         }
         
         if ("http".equalsIgnoreCase(httpScheme))

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public static URI toWebsocket(final URI inputUri) throws URISyntaxException`
`120`	`120`	`if ("ws".equalsIgnoreCase(httpScheme) \|\| "wss".equalsIgnoreCase(httpScheme))`
`121`	`121`	`{`
`122`	`122`	`// keep as-is`
`123`		`- return new URI(inputUri.toString());`
	`123`	`+ return inputUri;`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if ("http".equalsIgnoreCase(httpScheme))`