From 396b490bb3a604152d4afffac672aa0c48174c16 Mon Sep 17 00:00:00 2001
From: Micael Karlberg
Date: Mon, 5 Sep 2011 18:02:58 +0200
Subject: Removed the option *ossl* from the documentation.
OTP-9522
---
lib/inets/doc/src/httpc.xml | 13 ++++---------
lib/inets/doc/src/httpd.xml | 12 +++++-------
lib/inets/doc/src/notes.xml | 7 +++++++
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index d1671ac9bd..b1f964ae69 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -28,8 +28,10 @@
+
httpc
An HTTP/1.1 client
+
This module provides the API to a HTTP/1.1 compatible client according
to RFC 2616, caching is currently not supported.
@@ -167,7 +169,6 @@ filename() = string()
http_option() = {timeout, timeout()} |
{connect_timeout, timeout()} |
{ssl, ssloptions()} |
- {ossl, ssloptions()} |
{essl, ssloptions()} |
{autoredirect, boolean()} |
{proxy_auth, {userstring(), passwordstring()}} |
@@ -206,6 +207,7 @@ filename() = string()
to the receiver depending on that value.
Http option (http_option()) details:
+
-
@@ -231,16 +233,9 @@ filename() = string()
Defaults to [].
-
- -
-
If using the OpenSSL based (old) implementation of SSL,
- these SSL-specific options are used.
- Defaults to [].
-
-
-
-
If using the Erlang based (new) implementation of SSL,
+
If using the Erlang based implementation of SSL,
these SSL-specific options are used.
Defaults to [].
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index edacb73b65..f88099a82e 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -148,13 +148,11 @@
in the apache like configuration file.
- {socket_type, ip_comm | ssl | ossl | essl}
+ {socket_type, ip_comm | ssl | essl}
-
-
When using ssl, there are several alternatives.
- ossl specifically uses the OpenSSL based (old) SSL.
- essl specifically uses the Erlang based (new) SSL.
- When using ssl it currently defaults to
- essl.
+ When using ssl, there are currently only one alternative.
+ essl specifically uses the Erlang based SSL.
+ ssl defaults to essl.
Defaults to ip_comm.
@@ -162,7 +160,7 @@
-
Defaults to inet6fb4.
Note that this option is only used when the option
- socket_type has the value ip_comm.
+ socket_type has the value ip_comm.
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 2ced461c85..c53aa653d8 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -80,6 +80,13 @@
Own Id: OTP-9359
+ -
+
[httpc|httpd] The old ssl implementation (based on OpenSSL),
+ has been deprecated. The config option that specified usage of
+ this version of the ssl app, ossl, has been removed.
+ Own Id: OTP-9522
+
+
--
cgit v1.2.3