From cb907bf1edcd35276062666aa37e7a1cfc3a54d9 Mon Sep 17 00:00:00 2001 From: xcelder Date: Fri, 23 Mar 2018 09:08:44 +0100 Subject: [PATCH 1/2] Update WebSocketClient.java Added check for wss default port to avoid including it into the host. Some servers with proxy balancers may missunderstand the url if it includes the default port. --- src/main/java/org/java_websocket/client/WebSocketClient.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java index da30d5b8..4296b78f 100644 --- a/src/main/java/org/java_websocket/client/WebSocketClient.java +++ b/src/main/java/org/java_websocket/client/WebSocketClient.java @@ -434,7 +434,9 @@ private void sendHandshake() throws InvalidHandshakeException { if( part2 != null ) path += '?' + part2; int port = getPort(); - String host = uri.getHost() + ( port != WebSocket.DEFAULT_PORT ? ":" + port : "" ); + String host = uri.getHost() + ( + (port != WebSocket.DEFAULT_PORT && port != WbSocket.DEFAULT_WSS_PORT) + ? ":" + port : "" ); HandshakeImpl1Client handshake = new HandshakeImpl1Client(); handshake.setResourceDescriptor( path ); From 8a9df49a0e9fb7bedc0a08e10bed0862a28b9440 Mon Sep 17 00:00:00 2001 From: xcelder Date: Fri, 30 Mar 2018 13:53:15 +0200 Subject: [PATCH 2/2] Update WebSocketClient.java Typo fixed --- src/main/java/org/java_websocket/client/WebSocketClient.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java index 4296b78f..00e40fda 100644 --- a/src/main/java/org/java_websocket/client/WebSocketClient.java +++ b/src/main/java/org/java_websocket/client/WebSocketClient.java @@ -435,8 +435,9 @@ private void sendHandshake() throws InvalidHandshakeException { path += '?' + part2; int port = getPort(); String host = uri.getHost() + ( - (port != WebSocket.DEFAULT_PORT && port != WbSocket.DEFAULT_WSS_PORT) - ? ":" + port : "" ); + (port != WebSocket.DEFAULT_PORT && port != WebSocket.DEFAULT_WSS_PORT) + ? ":" + port + : "" ); HandshakeImpl1Client handshake = new HandshakeImpl1Client(); handshake.setResourceDescriptor( path );