Merge pull request #2 from tjulien/master

add support for specifying SSLSocketFactory
scalaj · May 31, 2011 · debe464 · debe464
2 parents a21b8f7 + e8f6be3
commit debe464
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/scala/scalaj/http/Http.scala b/src/main/scala/scalaj/http/Http.scala
@@ -6,6 +6,7 @@ import org.apache.commons.codec.binary.Base64
 import javax.net.ssl.HttpsURLConnection
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLSession
+import javax.net.ssl.SSLSocketFactory
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
 import javax.net.ssl.HostnameVerifier
@@ -36,6 +37,11 @@ object HttpOptions {
       httpsConn.setSSLSocketFactory(sc.getSocketFactory())
     case _ => // do nothing
   }
+  def sslSocketFactory(sslSocketFactory: SSLSocketFactory): HttpOption = c => c match {
+    case httpsConn: HttpsURLConnection =>
+      httpsConn.setSSLSocketFactory(sslSocketFactory) 
+    case _ => // do nothing
+  }
 }
 
 object MultiPart {