diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-02-25 17:43:02 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-02-25 17:43:02 +0100 |
| commit | e19bf9683c23a7f357d2726da2e62b8387d2acfa (patch) | |
| tree | d504628da91b61fcdb1a41353a92df40888e03f5 /lib/ssl/src/ssl.appup.src | |
| parent | 359f1eecff173054bbfc45df3dd6afa27140dc6b (diff) | |
| parent | 6303b6e4cdf3da296a83fd9b1c76302e36dcc912 (diff) | |
| download | otp-e19bf9683c23a7f357d2726da2e62b8387d2acfa.tar.gz otp-e19bf9683c23a7f357d2726da2e62b8387d2acfa.tar.bz2 otp-e19bf9683c23a7f357d2726da2e62b8387d2acfa.zip | |
Merge branch 'ia/ssl/fix-warnings'
* ia/ssl/fix-warnings:
ssl: Fix compiler warnings
ssl: Fix appup regexps and instructions
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 14 |
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}]} ] |