From c433c9089e3aeff7c9ae04248e2ec0993b0b9e9f Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Mon, 3 Dec 2012 16:16:06 +0100
Subject: ssl: Fix recv after timeout expired

Reset state so that "recv data" is not sent as "active data" after a recv
timed out and no new recv has been called.
---
 lib/ssl/test/ssl_basic_SUITE.erl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/ssl/test')

diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 7689da7200..112ed85ec5 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -4080,7 +4080,13 @@ send_recv_result(Socket) ->
 send_recv_result_timeout_client(Socket) ->
     {error, timeout} = ssl:recv(Socket, 11, 500),
     ssl:send(Socket, "Hello world"),
-    {ok, "Hello world"} = ssl:recv(Socket, 11),
+    receive
+	Msg ->
+	    io:format("Msg ~p~n",[Msg])
+    after 500 ->
+	    ok
+    end,
+    {ok, "Hello world"} = ssl:recv(Socket, 11, 500),
     ok.
 send_recv_result_timeout_server(Socket) ->
     ssl:send(Socket, "Hello"),
-- 
cgit v1.2.3