diff options
| author | Erlang/OTP <[email protected]> | 2014-10-13 09:38:47 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-10-13 09:38:47 +0200 |
| commit | aebab2324285d3751c1ce73ad803be487ceb3a16 (patch) | |
| tree | cf47b0a7e846325451e93bfd9573f4831f037cdd /lib/ssl/src/ssl.appup.src | |
| parent | ee24a87a779d8d10461cadd47b3eb276e70baef8 (diff) | |
| parent | 770000806112916bebbddf370f49ec501c0b8e69 (diff) | |
| download | otp-aebab2324285d3751c1ce73ad803be487ceb3a16.tar.gz otp-aebab2324285d3751c1ce73ad803be487ceb3a16.tar.bz2 otp-aebab2324285d3751c1ce73ad803be487ceb3a16.zip | |
Merge branch 'ia/17-patch/ssl/empty-sni-from-server/OTP-12198' into maint-17
* ia/17-patch/ssl/empty-sni-from-server/OTP-12198:
ssl: Prepare for release
ssl: Servers may include an empty SNI-extension
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 650901ef54..9d692379b4 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,6 +1,7 @@ %% -*- 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, []}, @@ -12,6 +13,7 @@ {<<"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,[]}, |