diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2015-04-07 10:34:18 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2015-04-07 10:34:18 +0300 |
| commit | b81b0d0be9da7276b09ea69d5f8a5d9f478b0113 (patch) | |
| tree | 5f1c05c886aca874738fbb0c96f8d94a654a4fae | |
| parent | Explicitly start crypto with start (diff) | |
| parent | fix otp version check in listen_tcp/5 (diff) | |
Merge pull request #518 from liudanking/master
fix otp version check in ejabberd_listener.erl listen_tcp/5
| -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, |