diff options
| author | Micael Karlberg <[email protected]> | 2011-09-09 12:22:52 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-09 12:22:52 +0200 |
| commit | a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203 (patch) | |
| tree | 612f52c27a693e57feff96f1bfa0fa1d01e0a0af /lib/inets/doc/src/httpd.xml | |
| parent | f602ae4f0c727c1ff37e69887ba33f46b24c54e1 (diff) | |
| parent | 4b8958c0397765bd208dbf0dd297c654ed0c33d1 (diff) | |
| download | otp-a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203.tar.gz otp-a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203.tar.bz2 otp-a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203.zip | |
Merge branch 'bmk/inets/inets58_integration' into major
[httpc] Deprecated interface module <c>http</c> has been removed.
It has (long) been replaced by http client interface module httpc.
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.
OTP-9522
Diffstat (limited to 'lib/inets/doc/src/httpd.xml')
| -rw-r--r-- | lib/inets/doc/src/httpd.xml | 12 |
1 files changed, 5 insertions, 7 deletions
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. </item> - <tag>{socket_type, ip_comm | ssl | ossl | essl}</tag> + <tag>{socket_type, ip_comm | ssl | essl}</tag> <item> - <p>When using ssl, there are several alternatives. - <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>essl</c>. </p> + <p>When using ssl, there are currently only one alternative. + <c>essl</c> specifically uses the Erlang based SSL. + <c>ssl</c> defaults to <c>essl</c>. </p> <p>Defaults to <c>ip_comm</c>. </p> </item> @@ -162,7 +160,7 @@ <item> <p>Defaults to <c>inet6fb4. </c> </p> <p>Note that this option is only used when the option - <c>socket_type</c> has the value <c>ip_comm</c>. </p> + <c>socket_type</c> has the value <c>ip_comm</c>. </p> </item> </taglist> |