aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-12-01 17:49:29 +0100
committerIngela Anderton Andin <[email protected]>2014-12-01 17:50:45 +0100
commitd9def0c852dfd5a3d10743cbed877cabe653d63a (patch)
tree20227bf7f90c2a908ba057e497471d413792da4f
parent918f5fc27fddc788d09eeb0ab0261b6c8762e0a4 (diff)
downloadotp-d9def0c852dfd5a3d10743cbed877cabe653d63a.tar.gz
otp-d9def0c852dfd5a3d10743cbed877cabe653d63a.tar.bz2
otp-d9def0c852dfd5a3d10743cbed877cabe653d63a.zip
ssl: Prepare for release
-rw-r--r--lib/ssl/src/ssl.appup.src12
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 1 insertions, 13 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 9d692379b4..b713f86c1e 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,24 +1,12 @@
%% -*- erlang -*-
{"%VSN%",
[
- {"5.3.6", [{load_module, ssl_handshake, soft_purge, soft_purge, [ssl_connection]}]},
- {"5.3.5", [{load_module, ssl, soft_purge, soft_purge, [ssl_connection]},
- {load_module, ssl_handshake, soft_purge, soft_purge, [ssl_certificate]},
- {load_module, ssl_certificate, soft_purge, soft_purge, []},
- {load_module, ssl_connection, soft_purge, soft_purge, [tls_connection]},
- {update, tls_connection, {advanced, {up, "5.3.5", "5.3.6"}}, [ssl_handshake]}]},
{<<"5\\.3\\.[1-4]($|\\..*)">>, [{restart_application, ssl}]},
{<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
],
[
- {"5.3.6", [{load_module, ssl_handshake, soft_purge, soft_purge, [ssl_connection]}]},
- {"5.3.5", [{load_module, ssl, soft_purge, soft_purge,[ssl_certificate]},
- {load_module, ssl_handshake, soft_purge, soft_purge,[ssl_certificate]},
- {load_module, ssl_certificate, soft_purge, soft_purge,[]},
- {load_module, ssl_connection, soft_purge, soft_purge,[tls_connection]},
- {update, tls_connection, {advanced, {down, "5.3.6", "5.3.5"}}, [ssl_handshake]}]},
{<<"5\\.3\\.[1-4]($|\\..*)">>, [{restart_application, ssl}]},
{<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index da20ed8593..bda974da0e 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.3.7
+SSL_VSN = 5.3.8