hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1733362 - /httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
Date Wed, 02 Mar 2016 20:47:19 GMT
Author: olegk
Date: Wed Mar  2 20:47:19 2016
New Revision: 1733362

URL: http://svn.apache.org/viewvc?rev=1733362&view=rev
Log:
HTTPCLIENT-1726: Copy the SNI fix from SSLConnectionSocketFactory to the deprecated SSLSocketFactory
class.

Signed-off-by: David Black <dblack@atlassian.com>

Modified:
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=1733362&r1=1733361&r2=1733362&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
(original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
Wed Mar  2 20:47:19 2016
@@ -39,6 +39,7 @@ import java.security.NoSuchAlgorithmExce
 import java.security.SecureRandom;
 import java.security.UnrecoverableKeyException;
 
+import javax.net.SocketFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 
@@ -519,9 +520,7 @@ public class SSLSocketFactory implements
 
     @Override
     public Socket createSocket(final HttpContext context) throws IOException {
-        final SSLSocket sock = (SSLSocket) this.socketfactory.createSocket();
-        internalPrepareSocket(sock);
-        return sock;
+        return SocketFactory.getDefault().createSocket();
     }
 
     @Override



Mime
View raw message