Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity

Merge pull request #518 from liudanking/master

Browse Source 
fix otp version check in ejabberd_listener.erl listen_tcp/5
This commit is contained in:
Evgeny Khramtsov 2015-04-07 10:34:18 +03:00
commit b81b0d0be9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ejabberd_listener.erl
View File

@ -195,9 +195,11 @@ listen_tcp(PortIP, Module, SockOpts, Port, IPS) ->
ets:delete(listen_sockets, Port), ets:delete(listen_sockets, Port),
ListenSocket; ListenSocket;
_ -> _ ->
SockOpts2 = try erlang:system_info(otp_release) >= "R13B" of SockOpts2 = try erlang:system_info(otp_release) of
true -> [{send_timeout_close, true} | SockOpts]; EVsn when EVsn >= "R13B"; EVsn >= "17" ->
false -> SockOpts [{send_timeout_close, true} | SockOpts];
_ ->
SockOpts
catch catch
_:_ -> [] _:_ -> []
end, end,