svn commit: r684578 - /httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java

[ol...@apache.org]

Author: olegk
Date: Sun Aug 10 12:35:36 2008
New Revision: 684578

URL: http://svn.apache.org/viewvc?rev=684578&view=rev
Log:
HTTPCLIENT-789: Support for passing an SSLContext to the SSLSocketFactory
Contributed by Bruno Harbulot <Bruno.Harbulot at manchester.ac.uk>

Modified:
    httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java

Modified: httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=684578&r1=684577&r2=684578&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java Sun Aug 10 12:35:36 2008
@@ -216,6 +216,20 @@
         this(TLS, null, null, truststore, null, null);
     }
 
+    public SSLSocketFactory(
+        final SSLContext sslContext,
+        final HostNameResolver nameResolver)
+    {
+        this.sslcontext = sslContext;
+        this.socketfactory = this.sslcontext.getSocketFactory();
+        this.nameResolver = nameResolver;
+    }
+
+    public SSLSocketFactory(final SSLContext sslContext)
+    {
+        this(sslContext, null);
+    }
+
     /**
      * Creates the default SSL socket factory.
      * This constructor is used exclusively to instantiate the factory for