diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-04-07 09:47:05 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-04-07 09:47:05 +0200 |
| commit | 0fd4984c234658c2e0df671d554092d278cc66cc (patch) | |
| tree | f8d452efb485748882d48f7cb9bece942b32d616 | |
| parent | Merge pull request #518 from liudanking/master (diff) | |
ejabberd_listener: Remove Erlang/OTP version check
We don't support Erlang/OTP versions older than R16 anyway.
| -rw-r--r-- | src/ejabberd_listener.erl | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl index 95021fe89..a4ccbe84e 100644 --- a/src/ejabberd_listener.erl +++ b/src/ejabberd_listener.erl @@ -195,22 +195,14 @@ listen_tcp(PortIP, Module, SockOpts, Port, IPS) -> ets:delete(listen_sockets, Port), ListenSocket; _ -> - SockOpts2 = try erlang:system_info(otp_release) of - EVsn when EVsn >= "R13B"; EVsn >= "17" -> - [{send_timeout_close, true} | SockOpts]; - _ -> - SockOpts - catch - _:_ -> [] - end, Res = gen_tcp:listen(Port, [binary, {packet, 0}, {active, false}, {reuseaddr, true}, {nodelay, true}, {send_timeout, ?TCP_SEND_TIMEOUT}, - {keepalive, true} | - SockOpts2]), + {send_timeout_close, true}, + {keepalive, true}]), case Res of {ok, ListenSocket} -> ListenSocket; |