diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-05-28 09:21:18 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-05-28 09:21:18 +0200 |
| commit | 0d0d642ba596d4bb92549e01d29b7295bd5a4698 (patch) | |
| tree | f6b51286134a631bc7c04a8758f98d60c2825856 /lib/inets/test/httpc_SUITE.erl | |
| parent | 9a99ab55b9a1d276174f6fbe43c256be3cf27e21 (diff) | |
| parent | 54ba6869f4807a5b70868eb0204900d9de0d9f43 (diff) | |
| download | otp-0d0d642ba596d4bb92549e01d29b7295bd5a4698.tar.gz otp-0d0d642ba596d4bb92549e01d29b7295bd5a4698.tar.bz2 otp-0d0d642ba596d4bb92549e01d29b7295bd5a4698.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/inets/test/httpc_SUITE.erl')
| -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, |