Merge pull request #465 from egk35/patch-2

grantland · grantland · commit 4b88c2898e9e · 2016-05-26T15:49:46.000-07:00
Don't override default SSL Socket Factory
diff --git a/Parse/src/main/java/com/parse/ParseURLConnectionHttpClient.java b/Parse/src/main/java/com/parse/ParseURLConnectionHttpClient.java
@@ -37,9 +37,6 @@
 
   public ParseURLConnectionHttpClient(int socketOperationTimeout, SSLSessionCache sslSessionCache) {
     this.socketOperationTimeout = socketOperationTimeout;
-
-    HttpsURLConnection.setDefaultSSLSocketFactory(SSLCertificateSocketFactory.getDefault(
-        socketOperationTimeout, sslSessionCache));
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,6 @@`
`37`	`37`
`38`	`38`	`public ParseURLConnectionHttpClient(int socketOperationTimeout, SSLSessionCache sslSessionCache) {`
`39`	`39`	`this.socketOperationTimeout = socketOperationTimeout;`
`40`		`-`
`41`		`- HttpsURLConnection.setDefaultSSLSocketFactory(SSLCertificateSocketFactory.getDefault(`
`42`		`- socketOperationTimeout, sslSessionCache));`
`43`	`40`	`}`
`44`	`41`
`45`	`42`	`@Override`