Merge pull request TooTallNate#442 from TooTallNate/pr/248

marci4 · web-flow · commit 0c724ec9867a · 2017-03-23T12:40:54.000+01:00
Use uri-encoded path and query parts of the uri Fixes TooTallNate#247
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -211,8 +211,8 @@ private int getPort() {
 
 	private void sendHandshake() throws InvalidHandshakeException {
 		String path;
-		String part1 = uri.getPath();
-		String part2 = uri.getQuery();
+		String part1 = uri.getRawPath();
+		String part2 = uri.getRawQuery();
 		if( part1 == null || part1.length() == 0 )
 			path = "/";
 		else
diff --git a/src/main/java/org/java_websocket/drafts/Draft.java b/src/main/java/org/java_websocket/drafts/Draft.java
@@ -169,7 +169,7 @@ public List<ByteBuffer> createHandshake( Handshakedata handshakedata, Role ownro
 		} else if( handshakedata instanceof ServerHandshake ) {
 			bui.append( "HTTP/1.1 101 " + ( (ServerHandshake) handshakedata ).getHttpStatusMessage() );
 		} else {
-			throw new RuntimeException( "unknow role" );
+			throw new RuntimeException( "unknown role" );
 		}
 		bui.append( "\r\n" );
 		Iterator<String> it = handshakedata.iterateHttpFields();

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public List<ByteBuffer> createHandshake( Handshakedata handshakedata, Role ownro`
`169`	`169`	`} else if( handshakedata instanceof ServerHandshake ) {`
`170`	`170`	`bui.append( "HTTP/1.1 101 " + ( (ServerHandshake) handshakedata ).getHttpStatusMessage() );`
`171`	`171`	`} else {`
`172`		`- throw new RuntimeException( "unknow role" );`
	`172`	`+ throw new RuntimeException( "unknown role" );`
`173`	`173`	`}`
`174`	`174`	`bui.append( "\r\n" );`
`175`	`175`	`Iterator<String> it = handshakedata.iterateHttpFields();`