diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-06-01 09:20:02 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-06-01 09:20:02 +0200 |
| commit | 4eca51173ff1f3404a00c8f52970acb12476b9bb (patch) | |
| tree | be1b82421fb651a235f982bd506cab37750bd9c1 /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | 196224d37f0e973444c20af3d90b2663e1e62da8 (diff) | |
| parent | 2c406958fd5c3060e4b4b574a65fa1a2a8ad31bf (diff) | |
| download | otp-4eca51173ff1f3404a00c8f52970acb12476b9bb.tar.gz otp-4eca51173ff1f3404a00c8f52970acb12476b9bb.tar.bz2 otp-4eca51173ff1f3404a00c8f52970acb12476b9bb.zip | |
Merge branch 'joedevivo/ssl/PR-1063/OTP-13635'
* joedevivo/ssl/PR-1063/OTP-13635:
ssl:recv timeout() can be 0
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 1 |
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 -> |