diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-12-04 18:18:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-04 18:18:34 +0000 |
| commit | 330c446c9e1dde25239f6d8f9060a512f126a6e7 (patch) | |
| tree | 036cac9ce500a2ed0f5796a005715eff0690b7ab | |
| parent | 1a6d50d0fd82dbc18555c881b3fa84cc37cd5a00 (diff) | |
| parent | 0d34a8551becc509efc79a4e071fa1f3f5d54687 (diff) | |
| download | okhttp-330c446c9e1dde25239f6d8f9060a512f126a6e7.tar.gz | |
Merge "Honor getDefaultHostnameVerifier in HttpsHandler."
| -rw-r--r-- | android/main/java/com/squareup/okhttp/HttpsHandler.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/android/main/java/com/squareup/okhttp/HttpsHandler.java b/android/main/java/com/squareup/okhttp/HttpsHandler.java index e3372f2..f7584fc 100644 --- a/android/main/java/com/squareup/okhttp/HttpsHandler.java +++ b/android/main/java/com/squareup/okhttp/HttpsHandler.java @@ -21,8 +21,6 @@ import java.net.Proxy; import java.util.Arrays; import java.util.List; -import javax.net.ssl.DefaultHostnameVerifier; -import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; public final class HttpsHandler extends HttpHandler { @@ -51,12 +49,9 @@ public final class HttpsHandler extends HttpHandler { client.setProtocols(ENABLED_PROTOCOLS); - HostnameVerifier verifier = HttpsURLConnection.getDefaultHostnameVerifier(); - // Assume that the internal verifier is better than the - // default verifier. - if (!(verifier instanceof DefaultHostnameVerifier)) { - client.setHostnameVerifier(verifier); - } + // OkHttp does not automatically honor the system-wide HostnameVerifier set with + // HttpsURLConnection.setDefaultHostnameVerifier(). + client.setHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()); // OkHttp does not automatically honor the system-wide SSLSocketFactory set with // HttpsURLConnection.setDefaultSSLSocketFactory(). // See https://github.com/square/okhttp/issues/184 for details. |