diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-04-16 23:51:16 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-04-16 23:51:16 +0200 |
| commit | afdc269825382687db46e04c5778a161ff96a9f1 (patch) | |
| tree | f845c01087cdea6c67793c4882762e8aa8fe949d /src | |
| parent | CSI test: Simplify and improve readability (diff) | |
ejabberd_s2s_out: Remove Erlang/OTP version check
The version check won't work for Erlang/OTP >= 17; and it's no longer
needed, as we don't support versions older than R16 anyway.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 97164326d..6196f136f 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -319,18 +319,11 @@ open_socket1(Host, Port) -> open_socket2(Type, Addr, Port) -> ?DEBUG("s2s_out: connecting to ~p:~p~n", [Addr, Port]), Timeout = outgoing_s2s_timeout(), - SockOpts = try erlang:system_info(otp_release) >= "R13B" - of - true -> [{send_timeout_close, true}]; - false -> [] - catch - _:_ -> [] - end, case catch ejabberd_socket:connect(Addr, Port, [binary, {packet, 0}, {send_timeout, ?TCP_SEND_TIMEOUT}, - {active, false}, Type - | SockOpts], + {send_timeout_close, true}, + {active, false}, Type], Timeout) of {ok, _Socket} = R -> R; |