diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-05-28 09:20:41 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-05-28 09:20:41 +0200 |
| commit | 54ba6869f4807a5b70868eb0204900d9de0d9f43 (patch) | |
| tree | edfa73db766097db5effb014fb2a060b94adec51 /lib/inets | |
| parent | fbf868910593b74776eba6a0c970b123502a759e (diff) | |
| parent | a2eb7ee1cd9cc19f1c4c14ad7ff4e70de05bfe96 (diff) | |
| download | otp-54ba6869f4807a5b70868eb0204900d9de0d9f43.tar.gz otp-54ba6869f4807a5b70868eb0204900d9de0d9f43.tar.bz2 otp-54ba6869f4807a5b70868eb0204900d9de0d9f43.zip | |
Merge branch 'ia/ssl/improved-options-handling/OTP-11950' into maint
* ia/ssl/improved-options-handling/OTP-11950:
ssl: Correct test SUITE
ssl: Add format_status function to ssl connection process
inets: Correct httpc_SUITE
ssl: Add ssl options to listen options tracker
ssl: Move init
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index 41021db7f0..f150cab877 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -1281,6 +1281,7 @@ dummy_ssl_server_loop(MFA, Handlers, ListenSocket) -> From ! {stopped, self()} after 0 -> {ok, Socket} = ssl:transport_accept(ListenSocket), + ok = ssl:ssl_accept(Socket, infinity), HandlerPid = dummy_request_handler(MFA, Socket), ssl:controlling_process(Socket, HandlerPid), HandlerPid ! ssl_controller, |