From fac5b0637447a2f8b098dc92ff3a0b6b3cd4e962 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 17 Aug 2017 12:07:59 +0200
Subject: Accept non-binary options as socket-options

For example the option {raw,6,6,<<2,0,0,0>>}
---
 lib/ssh/src/ssh_options.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl
index 7eeed70739..b41ad8b33b 100644
--- a/lib/ssh/src/ssh_options.erl
+++ b/lib/ssh/src/ssh_options.erl
@@ -236,7 +236,10 @@ save({Key,Value}, Defs, OptMap) when is_map(OptMap) ->
         %% by the check fun will give an error exception:
         error:{check,{BadValue,Extra}} ->
             error({eoptions, {Key,BadValue}, Extra})
-    end.
+    end;
+save(Opt, _Defs, OptMap) when is_map(OptMap) ->
+    OptMap#{socket_options := [Opt | maps:get(socket_options,OptMap)]}.
+
 
 %%%================================================================
 %%%
-- 
cgit v1.2.3


From e769d2c06eddfca16b1d4b5f7a3a7d1ed0218777 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Wed, 23 Aug 2017 10:39:49 +0200
Subject: Prepare release

---
 lib/ssh/doc/src/notes.xml | 16 ++++++++++++++++
 lib/ssh/vsn.mk            |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index f93753f1d2..5826d14a4a 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,22 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    All unknown options are sent to the transport handler
+	    regardless of type.</p>
+          <p>
+	    Own Id: OTP-14541 Aux Id: EIRERL-63 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.5</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 7208baca6e..006228f8e7 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.5
+SSH_VSN = 4.5.1
 
 APP_VSN    = "ssh-$(SSH_VSN)"
-- 
cgit v1.2.3