Avoid race condition of early handshake messages, when socket is acti…

…ve mode is not false.
hawk · Apr 16, 2010 · 5eaee42 · 5eaee42
1 parent f392892
commit 5eaee42
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
@@ -153,10 +153,10 @@ transport_accept(#sslsocket{pid = {ListenSocket, #config{cb=CbInfo, ssl=SslOpts}
     %% and options should be inherited.
     EmOptions = emulated_options(),
     {ok, InetValues} = inet:getopts(ListenSocket, EmOptions),
-    {CbModule,_,_} = CbInfo,
+    inet:setopts(ListenSocket, internal_inet_values()),
+    {CbModule,_,_} = CbInfo,    
     case CbModule:accept(ListenSocket, Timeout) of
 	{ok, Socket} ->
-	    inet:setopts(Socket, internal_inet_values()),
 	    {ok, Port} = inet:port(Socket),
 	    ConnArgs = [server, "localhost", Port, Socket,
 			{SslOpts, socket_options(InetValues)}, self(), CbInfo],