h4ckx0r/engine.io-client-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add setDefaultHostnameVerifier

Browse Source
This commit is contained in:
Naoyuki Kanezawa
2015-05-02 15:26:48 +09:00
parent 9a03310a53
commit 9e4b64adcc
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/github/nkzawa/engineio/client/Socket.java
View File

@@ -98,6 +98,7 @@ public class Socket extends Emitter {
private static boolean priorWebsocketSuccess = false; private static boolean priorWebsocketSuccess = false;
private static SSLContext defaultSSLContext; private static SSLContext defaultSSLContext;
private static HostnameVerifier defaultHostnameVerifier;
private boolean secure; private boolean secure;
private boolean upgrade; private boolean upgrade;
@@ -131,6 +132,10 @@ public class Socket extends Emitter {
defaultSSLContext = sslContext; defaultSSLContext = sslContext;
} }
public static void setDefaultHostnameVerifier(HostnameVerifier hostnameVerifier) {
defaultHostnameVerifier = hostnameVerifier;
}
public Socket() { public Socket() {
this(new Options()); this(new Options());
} }
@@ -199,7 +204,7 @@ public class Socket extends Emitter {
opts.transports : new String[]{Polling.NAME, WebSocket.NAME})); opts.transports : new String[]{Polling.NAME, WebSocket.NAME}));
this.policyPort = opts.policyPort != 0 ? opts.policyPort : 843; this.policyPort = opts.policyPort != 0 ? opts.policyPort : 843;
this.rememberUpgrade = opts.rememberUpgrade; this.rememberUpgrade = opts.rememberUpgrade;
this.hostnameVerifier = opts.hostnameVerifier; this.hostnameVerifier = opts.hostnameVerifier != null ? opts.hostnameVerifier : defaultHostnameVerifier;
} }
/** /**

5
src/test/java/com/github/nkzawa/engineio/client/SSLConnectionTest.java
View File

@@ -126,9 +126,8 @@ public class SSLConnectionTest extends Connection {
final BlockingQueue<Object> values = new LinkedBlockingQueue<Object>(); final BlockingQueue<Object> values = new LinkedBlockingQueue<Object>();
Socket.setDefaultSSLContext(createSSLContext()); Socket.setDefaultSSLContext(createSSLContext());
Socket.Options opts = createOptions(); Socket.setDefaultHostnameVerifier(SSLConnectionTest.hostnameVerifier);
opts.hostnameVerifier = SSLConnectionTest.hostnameVerifier; socket = new Socket(createOptions());
socket = new Socket(opts);
socket.on(Socket.EVENT_OPEN, new Emitter.Listener() { socket.on(Socket.EVENT_OPEN, new Emitter.Listener() {
@Override @Override
public void call(Object... args) { public void call(Object... args) {