Merge branch 'maint'

* maint:
  Updated OTP version
  Update release notes
  Update version numbers
  ssl: Prepare for release
  ssl: Proper handling of clients that choose to send an empty answer to a certificate request
  heart: Use ntohs instead of manual conversion

4 files changed, 27 insertions, 6 deletions

diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 45032faf6d..22db24de5f 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -346,9 +346,16 @@ clear_cmd(Config) when is_list(Config) ->
 
 get_cmd(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
-    Cmd = "test",
-    ok  = rpc:call(Node, heart, set_cmd, [Cmd]),
-    {ok, Cmd} = rpc:call(Node, heart, get_cmd, []),
+
+    ShortCmd = "test",
+    ok  = rpc:call(Node, heart, set_cmd, [ShortCmd]),
+    {ok, ShortCmd} = rpc:call(Node, heart, get_cmd, []),
+
+    %% This would hang prior to OTP-15024 being fixed.
+    LongCmd = [$a || _ <- lists:seq(1, 160)],
+    ok  = rpc:call(Node, heart, set_cmd, [LongCmd]),
+    {ok, LongCmd} = rpc:call(Node, heart, get_cmd, []),
+
     stop_node(Node),
     ok.
 
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 4ad7da9486..34fe352d08 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,22 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 8.2.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Proper handling of clients that choose to send an empty
+	    answer to a certificate request</p>
+          <p>
+	    Own Id: OTP-15050</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 8.2.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 4ad2a2f1fd..bfdd0c205b 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,7 +1,6 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {<<"8.2.4">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}]},
   {<<"8\\..*">>, [{restart_application, ssl}]},
   {<<"7\\..*">>, [{restart_application, ssl}]},
   {<<"6\\..*">>, [{restart_application, ssl}]},
@@ -10,7 +9,6 @@
   {<<"3\\..*">>, [{restart_application, ssl}]}
  ], 
  [
-  {<<"8.2.4">>, [{load_module, ssl_cipher, soft_purge, soft_purge, []}]},
   {<<"8\\..*">>, [{restart_application, ssl}]},
   {<<"7\\..*">>, [{restart_application, ssl}]},
   {<<"6\\..*">>, [{restart_application, ssl}]},
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 0ff22c5eab..eb85a55717 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 8.2.5
+SSL_VSN = 8.2.6