diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-09-21 16:16:07 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-09-21 16:16:07 +0200 |
| commit | e6a09778df9fc1be772a7d1bdf23b789b6f2b6b2 (patch) | |
| tree | fcba065d9ffcb12cac6b34df069cf58bbb956507 | |
| parent | c2fd9dc8a249a4cb093e9133fd3a3cf0d6711ff5 (diff) | |
| parent | d3f16a3688d920622c988a3b49bb3f9ba37d9958 (diff) | |
| download | otp-e6a09778df9fc1be772a7d1bdf23b789b6f2b6b2.tar.gz otp-e6a09778df9fc1be772a7d1bdf23b789b6f2b6b2.tar.bz2 otp-e6a09778df9fc1be772a7d1bdf23b789b6f2b6b2.zip | |
Merge branch 'ia/ssl/cuddle' into maint
* ia/ssl/cuddle:
ssl: listen socket should be set to active false
| -rw-r--r-- | lib/ssl/test/ssl_session_cache_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl index 0738869f2b..924898f6fa 100644 --- a/lib/ssl/test/ssl_session_cache_SUITE.erl +++ b/lib/ssl/test/ssl_session_cache_SUITE.erl @@ -143,8 +143,8 @@ client_unique_session(Config) when is_list(Config) -> Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, {from, self()}, - {from, self()}, {mfa, {ssl_test_lib, no_result, []}}, + {tcp_options, [{active, false}]}, {options, ServerOpts}]), Port = ssl_test_lib:inet_port(Server), LastClient = clients_start(Server, |