diff options
| author | Zandra Hird <[email protected]> | 2015-04-10 14:51:04 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-04-10 14:51:04 +0200 |
| commit | b5f3973cc50a193be868e672b2ced6dd619427c4 (patch) | |
| tree | bfe20ffc467ef3c535fd5580f89cc4c1ab8ca818 /lib/ssh/src/ssh.erl | |
| parent | 5c2c2f537e66f1637eb51b364cb962a69a7b0faf (diff) | |
| parent | bbac1019905e6e493a2cd3c8463e53a818d0723d (diff) | |
| download | otp-b5f3973cc50a193be868e672b2ced6dd619427c4.tar.gz otp-b5f3973cc50a193be868e672b2ced6dd619427c4.tar.bz2 otp-b5f3973cc50a193be868e672b2ced6dd619427c4.zip | |
Merge branch 'maint-17'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index eae33e3683..51ad691ba2 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -345,9 +345,14 @@ handle_option([{parallel_login, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([parallel_login|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option({parallel_login,true}) | SshOptions]); +handle_option([{minimal_remote_max_packet_size, _} = Opt|Rest], SocketOptions, SshOptions) -> + handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions). + +handle_ssh_option({minimal_remote_max_packet_size, Value} = Opt) when is_integer(Value), Value >=0 -> + Opt; handle_ssh_option({system_dir, Value} = Opt) when is_list(Value) -> Opt; handle_ssh_option({user_dir, Value} = Opt) when is_list(Value) -> |