hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1572935 - /httpcomponents/httpclient/branches/4.3.x/src/docbkx/connmgmt.xml
Date Fri, 28 Feb 2014 12:28:16 GMT
Author: olegk
Date: Fri Feb 28 12:28:16 2014
New Revision: 1572935

URL: http://svn.apache.org/r1572935
Log:
Minor corrections in the SSL customization chapter

Modified:
    httpcomponents/httpclient/branches/4.3.x/src/docbkx/connmgmt.xml

Modified: httpcomponents/httpclient/branches/4.3.x/src/docbkx/connmgmt.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.3.x/src/docbkx/connmgmt.xml?rev=1572935&r1=1572934&r2=1572935&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.3.x/src/docbkx/connmgmt.xml (original)
+++ httpcomponents/httpclient/branches/4.3.x/src/docbkx/connmgmt.xml Fri Feb 28 12:28:16 2014
@@ -428,13 +428,12 @@ HttpClients.custom()
         </section>
         <section>
             <title>SSL/TLS customization</title>
-            <para>HttpClient makes use of SSLSocketFactory to create SSL connections.
-                <classname>SSLSocketFactory</classname> allows for a high degree
of
-                customization. It can take an instance of
+            <para>HttpClient makes use of <classname>SSLConnectionSocketFactory</classname>
+                to create SSL connections. <classname>SSLConnectionSocketFactory</classname>
allows
+                for a high degree of customization. It can take an instance of
                 <interfacename>javax.net.ssl.SSLContext</interfacename> as a
parameter and use
                 it to create custom configured SSL connections.</para>
             <programlisting><![CDATA[
-HttpClientContext clientContext = HttpClientContext.create();
 KeyStore myTrustStore = <...>
 SSLContext sslContext = SSLContexts.custom()
         .useTLS()
@@ -442,11 +441,12 @@ SSLContext sslContext = SSLContexts.cust
         .build();
 SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext);
 ]]></programlisting>
-            <para>Customization of SSLSocketFactory implies a certain degree of familiarity
with the
-                concepts of the SSL/TLS protocol, a detailed explanation of which is out
of scope
-                for this document. Please refer to the <ulink
-                        url="http://java.sun.com/j2se/1.5.0/docs/guide/security/jsse/JSSERefGuide.html"
-                        >Java Secure Socket Extension</ulink> for a detailed description
of
+            <para>Customization of <classname>SSLConnectionSocketFactory</classname>
implies
+                a certain degree of familiarity with the concepts of the SSL/TLS protocol,
+                a detailed explanation of which is out of scope for this document. Please
refer
+                to the <ulink
+                url="http://java.sun.com/j2se/1.5.0/docs/guide/security/jsse/JSSERefGuide.html">
+                Java Secure Socket Extension</ulink> for a detailed description of
                 <interfacename>javax.net.ssl.SSLContext</interfacename> and related
                 tools.</para>
         </section>



Mime
View raw message