Merge pull request #518 from liudanking/master

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

View File

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