Merge pull request #51 from ekudel/for_upsource

proxy support
This commit is contained in:
Naoyuki Kanezawa
2016-09-16 13:55:00 +02:00
committed by GitHub
4 changed files with 44 additions and 7 deletions

View File

@@ -12,6 +12,7 @@ import org.json.JSONException;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
import java.net.Proxy;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
@@ -123,6 +124,9 @@ public class Socket extends Emitter {
private Future pingIntervalTimer;
private SSLContext sslContext;
private HostnameVerifier hostnameVerifier;
public Proxy proxy;
public String proxyLogin;
public String proxyPassword;
private ReadyState readyState;
private ScheduledExecutorService heartbeatScheduler;
@@ -200,6 +204,9 @@ public class Socket extends Emitter {
this.policyPort = opts.policyPort != 0 ? opts.policyPort : 843;
this.rememberUpgrade = opts.rememberUpgrade;
this.hostnameVerifier = opts.hostnameVerifier != null ? opts.hostnameVerifier : defaultHostnameVerifier;
this.proxy = opts.proxy;
this.proxyLogin = opts.proxyLogin;
this.proxyPassword = opts.proxyPassword;
}
public static void setDefaultSSLContext(SSLContext sslContext) {
@@ -266,6 +273,9 @@ public class Socket extends Emitter {
opts.policyPort = this.policyPort;
opts.socket = this;
opts.hostnameVerifier = this.hostnameVerifier;
opts.proxy = this.proxy;
opts.proxyLogin = this.proxyLogin;
opts.proxyPassword = this.proxyPassword;
Transport transport;
if (WebSocket.NAME.equals(name)) {