android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-25 16:01:38 +03:00
Code Releases Activity

Merge branch 'master' of https://github.com/square/okhttp

Browse Source
This commit is contained in:
Jake Wharton
2013-05-05 23:31:51 -07:00
parent 37a513bbdb 02864cb742
commit aa5b82378d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
View File

@@ -147,7 +147,7 @@ public final class OkHttpClient {
return this;
}
public SSLSocketFactory getSslSocketFactory() {
public SSLSocketFactory getSSLSocketFactory() {
return sslSocketFactory;
}

2
okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
View File

@@ -114,7 +114,7 @@ public class HttpURLConnectionImpl extends HttpURLConnection {
this.proxySelector = client.getProxySelector();
this.cookieHandler = client.getCookieHandler();
this.connectionPool = client.getConnectionPool();
this.sslSocketFactory = client.getSslSocketFactory();
this.sslSocketFactory = client.getSSLSocketFactory();
this.hostnameVerifier = client.getHostnameVerifier();
this.transports = client.getTransports();
this.authenticator = client.getAuthenticator();