]> granicus.if.org Git - ejabberd/commitdiff
ejabberd_listener: Remove Erlang/OTP version check
authorHolger Weiss <holger@zedat.fu-berlin.de>
Tue, 7 Apr 2015 07:47:05 +0000 (09:47 +0200)
committerHolger Weiss <holger@zedat.fu-berlin.de>
Tue, 7 Apr 2015 07:47:05 +0000 (09:47 +0200)
We don't support Erlang/OTP versions older than R16 anyway.

src/ejabberd_listener.erl

index 95021fe89613f0c22a6a140a7d0498ff2a2a19ab..a4ccbe84ebb83b697a3c5fbc99b5e7c8ab787d79 100644 (file)
@@ -195,22 +195,14 @@ listen_tcp(PortIP, Module, SockOpts, Port, IPS) ->
            ets:delete(listen_sockets, Port),
            ListenSocket;
        _ ->
-           SockOpts2 = try erlang:system_info(otp_release) of
-                           EVsn when EVsn >= "R13B"; EVsn >= "17" -> 
-                    [{send_timeout_close, true} | SockOpts];
-                           _ -> 
-                    SockOpts
-                       catch
-                           _:_ -> []
-                       end,
            Res = gen_tcp:listen(Port, [binary,
                                        {packet, 0},
                                        {active, false},
                                        {reuseaddr, true},
                                        {nodelay, true},
                                        {send_timeout, ?TCP_SEND_TIMEOUT},
-                                       {keepalive, true} |
-                                       SockOpts2]),
+                                       {send_timeout_close, true},
+                                       {keepalive, true}]),
            case Res of
                {ok, ListenSocket} ->
                    ListenSocket;