diff options
| author | Erlang/OTP <[email protected]> | 2017-08-23 10:39:25 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-08-23 10:39:25 +0200 |
| commit | c150a747affa0d1cba56cbfbf207e65ffe52e6ed (patch) | |
| tree | 89dc47901d2ea907969c6c136d933d2b04c0fca1 /lib | |
| parent | 9685b8b517438279fb647563d4f9e42c72db24da (diff) | |
| parent | fac5b0637447a2f8b098dc92ff3a0b6b3cd4e962 (diff) | |
| download | otp-c150a747affa0d1cba56cbfbf207e65ffe52e6ed.tar.gz otp-c150a747affa0d1cba56cbfbf207e65ffe52e6ed.tar.bz2 otp-c150a747affa0d1cba56cbfbf207e65ffe52e6ed.zip | |
Merge branch 'hans/ssh/non_binary_socket_options/ERIERL-63/OTP-14541' into maint-20
* hans/ssh/non_binary_socket_options/ERIERL-63/OTP-14541:
Accept non-binary options as socket-options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/src/ssh_options.erl | 5 |
1 files changed, 4 insertions, 1 deletions
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)]}. + %%%================================================================ %%% |