diff options
| author | liudan <liudan@nibirutech.com> | 2015-04-07 09:28:35 +0800 |
|---|---|---|
| committer | liudan <liudan@nibirutech.com> | 2015-04-07 09:28:35 +0800 |
| commit | f981a53f9aa0f7a94df9502a4d5b423e6b862f7c (patch) | |
| tree | 44d3cf4274ac50cdb7c84985f0ebe91843ec73af /src | |
| parent | Don't call send_element/2 if previous call failed (diff) | |
fix otp version check in listen_tcp/5
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_listener.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl index 73870413c..95021fe89 100644 --- a/src/ejabberd_listener.erl +++ b/src/ejabberd_listener.erl @@ -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, |