]> granicus.if.org Git - ejabberd/commitdiff
fix otp version check in listen_tcp/5
authorliudan <liudan@nibirutech.com>
Tue, 7 Apr 2015 01:28:35 +0000 (09:28 +0800)
committerliudan <liudan@nibirutech.com>
Tue, 7 Apr 2015 01:28:35 +0000 (09:28 +0800)
src/ejabberd_listener.erl

index 73870413c7e05217987d138b1c10925d55237580..95021fe89613f0c22a6a140a7d0498ff2a2a19ab 100644 (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,