diff options
| author | Henrik Nord <[email protected]> | 2015-10-14 12:42:50 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-10-14 12:42:50 +0200 |
| commit | f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2 (patch) | |
| tree | 0eaaf1c3424cb924d7eb30558089ede1e3730872 /lib/ssh/src/ssh.erl | |
| parent | 11229947bed829ee0691d9669a4858fd8cf6cbb7 (diff) | |
| parent | 930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9 (diff) | |
| download | otp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.tar.gz otp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.tar.bz2 otp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 15591fb4a7..b6ee29efbb 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -385,6 +385,8 @@ handle_option([{rekey_limit, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{max_sessions, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); +handle_option([{max_channels, _} = Opt|Rest], SocketOptions, SshOptions) -> + handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{negotiation_timeout, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{parallel_login, _} = Opt|Rest], SocketOptions, SshOptions) -> @@ -443,6 +445,8 @@ handle_ssh_option({connect_timeout, Value} = Opt) when is_integer(Value); Value Opt; handle_ssh_option({max_sessions, Value} = Opt) when is_integer(Value), Value>0 -> Opt; +handle_ssh_option({max_channels, Value} = Opt) when is_integer(Value), Value>0 -> + Opt; handle_ssh_option({negotiation_timeout, Value} = Opt) when is_integer(Value); Value == infinity -> Opt; handle_ssh_option({parallel_login, Value} = Opt) when Value==true ; Value==false -> |