Skip to content

fix proxy setting not taken into account in ssl mode #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix proxy setting not taken into account in ssl mode #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/main/java/com/pusher/client/connection/websocket/WebSocketClientWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.pusher.client.connection.websocket;

import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.Socket;
import java.net.URI;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
Expand All @@ -10,6 +12,7 @@
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSocketFactory;

import com.pusher.java_websocket.WebSocket;
import com.pusher.java_websocket.client.WebSocketClient;
import com.pusher.java_websocket.handshake.ServerHandshake;

Expand Down Expand Up @@ -37,9 +40,13 @@ public WebSocketClientWrapper(final URI uri, final Proxy proxy, final WebSocketL
// certificates

final SSLSocketFactory factory = sslContext.getSocketFactory();// (SSLSocketFactory)
// SSLSocketFactory.getDefault();

setSocket(factory.createSocket());
int port = uri.getPort();
if( port == -1 ) {
port = WebSocket.DEFAULT_WSS_PORT;
} // SSLSocketFactory.getDefault();
Socket socket = new Socket(proxy);
socket.connect(new InetSocketAddress(uri.getHost(), port));
setSocket(factory.createSocket(socket, uri.getHost(), port, true));
}
catch (final IOException e) {
throw new SSLException(e);
Expand Down