Merge pull request TooTallNate#1070 from marci4/Issue1058

Author: marci4

src/main/java/org/java_websocket/client/WebSocketClient.java

@@ -461,12 +461,16 @@ public void sendPing(){
 publicvoidrun(){
 InputStreamistream;
 try{
-booleanisNewSocket = false;
-if (socketFactory != null){
+booleanupgradeSocketToSSLSocket = false;
+// Prioritise a proxy over a socket factory and apply the socketfactory later
+if (proxy != Proxy.NO_PROXY){
+socket = newSocket(proxy);
+upgradeSocketToSSLSocket = true;
+ } elseif (socketFactory != null){
 socket = socketFactory.createSocket();
  } elseif (socket == null){
 socket = newSocket(proxy);
-isNewSocket = true;
+upgradeSocketToSSLSocket = true;
  } elseif (socket.isClosed()){
 thrownewIOException();
  }
@@ -480,10 +484,17 @@ public void run(){
  }
 
 // if the socket is set by others we don't apply any TLS wrapper
-if (isNewSocket && "wss".equals(uri.getScheme())){
-SSLContextsslContext = SSLContext.getInstance("TLSv1.2");
-sslContext.init(null, null, null);
-SSLSocketFactoryfactory = sslContext.getSocketFactory();
+if (upgradeSocketToSSLSocket && "wss".equals(uri.getScheme())){
+SSLSocketFactoryfactory;
+// Prioritise the provided socketfactory
+// Helps when using web debuggers like Fiddler Classic
+if (socketFactory != null && (socketFactoryinstanceofSSLSocketFactory)){
+factory = (SSLSocketFactory) socketFactory;
+ } else{
+SSLContextsslContext = SSLContext.getInstance("TLSv1.2");
+sslContext.init(null, null, null);
+factory = sslContext.getSocketFactory();
+ }
 socket = factory.createSocket(socket, uri.getHost(), getPort(), true);
  }