From 5488c7843c8930d14d1d0d2ec0aa23d0d491afbc Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 19 Apr 2011 13:37:06 +0200
Subject: Default ssl kind changed to essl (from ossl).

---
 lib/inets/doc/src/httpc.xml              | 21 ++++++---------------
 lib/inets/doc/src/httpd.xml              |  2 +-
 lib/inets/doc/src/notes.xml              | 13 +++++++++++++
 lib/inets/src/http_lib/http_internal.hrl |  6 +++---
 4 files changed, 23 insertions(+), 19 deletions(-)

(limited to 'lib/inets')

diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index 532f5eefde..f6b6827e93 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -105,17 +105,8 @@ filename()       = string()
   
   <section>
     <title>SSL DATA TYPES </title>
-    <p>Some type definitions relevant when using https,
-      for details <seealso marker="ssl:ssl">ssl(3)</seealso>: </p>
-    <code type="none"><![CDATA[
-ssl_options() = {verify,     code()}   | 
-                {depth,      depth()}  | 
-                {certfile,   path()}   | 
-                {keyfile,    path()}   | 
-                {password,   string()} | 
-                {cacertfile, path()}   | 
-                {ciphers,    string()} 
-    ]]></code>
+    <p>See <seealso marker="ssl:ssl">ssl(3)</seealso> for information
+    about ssl options (<c>ssloptions()</c>). </p>
   </section>
 
   <section>
@@ -175,9 +166,9 @@ ssl_options() = {verify,     code()}   |
         <v>http_options() = [http_option()]</v>
         <v>http_option() = {timeout,         timeout()} | 
                            {connect_timeout, timeout()} | 
-                           {ssl,             ssl_options()} | 
-                           {ossl,            ssl_options()} | 
-                           {essl,            ssl_options()} | 
+                           {ssl,             ssloptions()} | 
+                           {ossl,            ssloptions()} | 
+                           {essl,            ssloptions()} | 
                            {autoredirect,    boolean()} | 
                            {proxy_auth, {userstring(), passwordstring()}} | 
                            {version,         http_version()} | 
@@ -236,7 +227,7 @@ ssl_options() = {verify,     code()}   |
           <tag><c><![CDATA[ssl]]></c></tag>
           <item>
             <p>This is the default ssl config option, currently defaults to 
-              <c>ossl</c>, see below. </p>
+              <c>essl</c>, see below. </p>
             <p>Defaults to <c>[]</c>. </p>
 	  </item>
 
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index ac49a37296..edacb73b65 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -154,7 +154,7 @@
           <c>ossl</c> specifically uses the OpenSSL based (old) SSL. 
           <c>essl</c> specifically uses the Erlang based (new) SSL. 
           When using <c>ssl</c> it <em>currently</em> defaults to 
-          <c>ossl</c>. </p>
+          <c>essl</c>. </p>
 	<p>Defaults to <c>ip_comm</c>. </p> 
       </item>
 
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index df3bf19066..b885bcbcdb 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -91,6 +91,19 @@
           <p>Aux Id: seq11819</p>
         </item>
 
+        <item>
+          <p>The default ssl kind has now been changed to <c>essl</c>. </p>
+	  <p><c>ossl</c> will work for as long as the ssl application 
+	  supports it. </p>
+	  <p>See the httpd 
+	  <seealso marker="httpd#comm_prop">socket_type</seealso> 
+	  communication property or the httpc 
+	  <seealso marker="httpc#request2">request/4,5</seealso> function
+	  for more info. </p>
+	  <p>Own Id: OTP-9230</p>
+	  <p>*** POTENTIAL INCOMPATIBILITY ***</p>
+        </item>
+
       </list>
     </section>
 
diff --git a/lib/inets/src/http_lib/http_internal.hrl b/lib/inets/src/http_lib/http_internal.hrl
index 5440f214b5..2e924667c6 100644
--- a/lib/inets/src/http_lib/http_internal.hrl
+++ b/lib/inets/src/http_lib/http_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -28,8 +28,8 @@
 -define(HTTP_MAX_URI_SIZE,    nolimit).
 
 -ifndef(HTTP_DEFAULT_SSL_KIND).
--define(HTTP_DEFAULT_SSL_KIND, ossl).
-%% -define(HTTP_DEFAULT_SSL_KIND, essl).
+%% -define(HTTP_DEFAULT_SSL_KIND, ossl).
+-define(HTTP_DEFAULT_SSL_KIND, essl).
 -endif. % -ifdef(HTTP_DEFAULT_SSL_KIND).
 
 
-- 
cgit v1.2.3