diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:26:32 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:26:32 +0100 |
| commit | c0b39f22abf34f6a0fb233418a02b2e6f41875e3 (patch) | |
| tree | 8d40c0090512cb2b56db4820af4b0135ad749a27 /lib/ssl/src/ssl.appup.src | |
| parent | 1a8fda28b3fdb48fb080a49a001ca167ba8834c5 (diff) | |
| parent | 97cf23313999ac4dfb508f9f98ea63a80e6144c9 (diff) | |
| download | otp-c0b39f22abf34f6a0fb233418a02b2e6f41875e3.tar.gz otp-c0b39f22abf34f6a0fb233418a02b2e6f41875e3.tar.bz2 otp-c0b39f22abf34f6a0fb233418a02b2e6f41875e3.zip | |
Merge branch 'ia/ssl/server-name-indication-missing-option-validation/OTP-11567' into maint
* ia/ssl/server-name-indication-missing-option-validation/OTP-11567:
ssl: Prepare for release
ssl: Add missing options validation of server_name_indication
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index c090b6ebfb..a0cdebe547 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,7 +1,8 @@ %% -*- erlang -*- {"%VSN%", [ - {<<"5.3\\*">>, [{restart_application, ssl}]}, + {<<"5.3.2">>, [{load_module, ssl, 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}]}, @@ -9,7 +10,8 @@ {<<"3\\.*">>, [{restart_application, ssl}]} ], [ - {<<"5.3\\*">>, [{restart_application, ssl}]}, + {<<"5.3.2">>, [{load_module, ssl, 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}]}, |