diff options
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 29 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
3 files changed, 8 insertions, 25 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 5098d26a3a..f2c1062102 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -70,7 +70,7 @@ <seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso>. </p> - <p> <c>ssloption() = {verify, verify_type()} | + <p><marker id="type-ssloption"></marker><c>ssloption() = {verify, verify_type()} | {verify_fun, {fun(), term()}} | {fail_if_no_peer_cert, boolean()} {depth, integer()} | diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 664f588003..c04d29bfc6 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,34 +1,17 @@ %% -*- erlang -*- {"%VSN%", [ - {"5.1.2", - [ - {restart_application, inets} - ] - }, - {"5.1.1", [{restart_application, ssl}] - }, - {"5.1", [ - {load_module, ssl_connection, soft_purge, soft_purge, []} - ] - }, + {"5.1.2", [{restart_application, ssl}]}, + {"5.1.1", [{restart_application, ssl}]}, + {"5.1", [{restart_application, ssl}]}, {<<"5.0\\*">>, [{restart_application, ssl}]}, {<<"4\\.*">>, [{restart_application, ssl}]}, {<<"3\\.*">>, [{restart_application, ssl}]} ], [ - {"5.1.2", - [ - {restart_application, inets} - ] - }, - {"5.1.1", [{restart_application, ssl}] - }, - {"5.1", [ - {load_module, ssl_connection, soft_purge, soft_purge, []} - ] - }, - {"5.1", [{restart_application, ssl}]}, + {"5.1.2", [{restart_application, ssl}]}, + {"5.1.1", [{restart_application, ssl}]}, + {"5.1", [{restart_application, ssl}]}, {<<"5.0\\*">>, [{restart_application, ssl}]}, {<<"4\\.*">>, [{restart_application, ssl}]}, {<<"3\\.*">>, [{restart_application, ssl}]} diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 84728fd311..7b9b6d03bc 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 5.1.2.1 +SSL_VSN = 5.1.2.2 |