aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2014-02-25 16:02:07 +0100
committerIngela Anderton Andin <ingela@erlang.org>2014-02-25 17:19:51 +0100
commitb254363cab0b54fffde44fb6fd217143de028dfe (patch)
tree8f4de5494a42fc070f801babe2b9d8c1b1d37211
parentb9440a0529bea5ccc3f4341db29ddda6f4b7c536 (diff)
downloadotp-b254363cab0b54fffde44fb6fd217143de028dfe.tar.gz
otp-b254363cab0b54fffde44fb6fd217143de028dfe.tar.bz2
otp-b254363cab0b54fffde44fb6fd217143de028dfe.zip
ssl: Fix appup regexps and instructions
-rw-r--r--lib/ssl/src/ssl.appup.src14
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index d53c58ff86..b0ef292c4e 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -9,11 +9,10 @@
{"5.3.2", [{load_module, ssl, soft_purge, soft_purge, []},
{load_module, ssl_connection, soft_purge, soft_purge, []},
{load_module, ssl_handshake, soft_purge, soft_purge, []},
+ {load_module, tls_handshake, soft_purge, soft_purge, []},
{load_module, tls_connection, soft_purge, soft_purge, []}]},
- {"5.3.1", [{restart_application, ssl}]},
- {<<"5\\.2\\*">>, [{restart_application, ssl}]},
- {<<"5\\.1\\*">>, [{restart_application, ssl}]},
- {<<"5\\.0\\*">>, [{restart_application, ssl}]},
+ {<<"5\\.3\\.1($|\\..*)">>, [{restart_application, ssl}]},
+ {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
],
@@ -26,11 +25,10 @@
{"5.3.2", [{load_module, ssl, soft_purge, soft_purge, []},
{load_module, ssl_connection, soft_purge, soft_purge, []},
{load_module, ssl_handshake, soft_purge, soft_purge, []},
+ {load_module, tls_handshake, soft_purge, soft_purge, []},
{load_module, tls_connection, soft_purge, soft_purge, []}]},
- {"5.3.1", [{restart_application, ssl}]},
- {<<"5\\.2.*">>, [{restart_application, ssl}]},
- {<<"5\\.1.*">>, [{restart_application, ssl}]},
- {<<"5\\.0.*">>, [{restart_application, ssl}]},
+ {<<"5\\.3\\.1($|\\..*)">>, [{restart_application, ssl}]},
+ {<<"5\\.[0-2]($|\\..*)">>, [{restart_application, ssl}]},
{<<"4\\..*">>, [{restart_application, ssl}]},
{<<"3\\..*">>, [{restart_application, ssl}]}
]