diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-11-22 09:49:39 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-11-22 09:49:39 +0100 |
| commit | 3b29d36e9300d90e84b2ab751eeb5a2a0a332f6b (patch) | |
| tree | 9f6d2517bb868db54f861d0d36de76a29ed65d81 | |
| parent | d0a2e9f20b484fd04962784473d3a32adc971a3f (diff) | |
| parent | bc7cf293a513bb571831e16ac95827144051a783 (diff) | |
| download | otp-3b29d36e9300d90e84b2ab751eeb5a2a0a332f6b.tar.gz otp-3b29d36e9300d90e84b2ab751eeb5a2a0a332f6b.tar.bz2 otp-3b29d36e9300d90e84b2ab751eeb5a2a0a332f6b.zip | |
Merge branch 'maint'
* maint:
is_boolean/1 is called instead of checking
Removed ip options to gen_tcp from ssh.erl
| -rw-r--r-- | lib/ssh/src/ssh.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index a569298056..719c97e940 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -420,8 +420,7 @@ handle_ssh_option({disconnectfun , Value} = Opt) when is_function(Value) -> Opt; handle_ssh_option({failfun, Value} = Opt) when is_function(Value) -> Opt; -handle_ssh_option({ip_v6_disabled, Value} = Opt) when Value == true; - Value == false -> +handle_ssh_option({ip_v6_disabled, Value} = Opt) when is_boolean(Value) -> Opt; handle_ssh_option({transport, {Protocol, Cb, ClosTag}} = Opt) when is_atom(Protocol), is_atom(Cb), @@ -474,7 +473,7 @@ check_pref_algs([H|T]) -> inetopt(true) -> inet; inetopt(false) -> - case gen_tcp:listen(0, [inet6, {ip, loopback}]) of + case gen_tcp:listen(0, [inet6]) of {ok, Dummyport} -> gen_tcp:close(Dummyport), inet6; |