aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test
diff options
context:
space:
mode:
authorJoe DeVivo <[email protected]>2016-05-31 11:08:02 +0200
committerIngela Anderton Andin <[email protected]>2016-05-31 11:17:37 +0200
commit2c406958fd5c3060e4b4b574a65fa1a2a8ad31bf (patch)
tree76380e389cb7d34ae67b3c0b5e986f4df0ecdf58 /lib/ssl/test
parent962b25f3b2879a48a8cd0596ffad862beb82d4d9 (diff)
downloadotp-2c406958fd5c3060e4b4b574a65fa1a2a8ad31bf.tar.gz
otp-2c406958fd5c3060e4b4b574a65fa1a2a8ad31bf.tar.bz2
otp-2c406958fd5c3060e4b4b574a65fa1a2a8ad31bf.zip
ssl:recv timeout() can be 0
gen_tcp:recv allows this, and if you're doing something like Transport:recv(Socket, 0, 0), TCP will work and SSL will exit with function_clause There were other cases of this throughout the module. This PR cleans them all up.
Diffstat (limited to 'lib/ssl/test')
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 686cdc569d..85a8c1e2d0 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -3939,6 +3939,7 @@ prf_verify_value(Socket, TlsVer, Expected, Algo) ->
send_recv_result_timeout_client(Socket) ->
{error, timeout} = ssl:recv(Socket, 11, 500),
+ {error, timeout} = ssl:recv(Socket, 11, 0),
ssl:send(Socket, "Hello world"),
receive
Msg ->