From 192d3c9832845bb138f4e772bd3095aa144adce4 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Tue, 5 Apr 2016 21:49:17 +0300
Subject: [PATCH] Set default hostname verifier and socket factory for
 URLConnection

---
 .../src/com/intellij/util/net/ssl/CertificateManager.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java b/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java
index de7ac7d1b5e0..32f37e24c797 100644
--- a/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java
+++ b/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java
@@ -131,7 +131,10 @@ public class CertificateManager implements PersistentStateComponent<CertificateM
       // Don't do this: protocol created this way will ignore SSL tunnels. See IDEA-115708.
       // Protocol.registerProtocol("https", CertificateManager.createDefault().createProtocol());
       if (Registry.is("ide.certificate.manager")) {
-        SSLContext.setDefault(getSslContext());
+        SSLContext sslContext = getSslContext();
+        SSLContext.setDefault(sslContext);
+        HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
+        HttpsURLConnection.setDefaultHostnameVerifier(HOSTNAME_VERIFIER);
         LOG.debug("Default SSL context initialized");
       }
     }