aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-09-21 17:06:27 +0200
committerAnders Svensson <[email protected]>2015-09-21 17:06:27 +0200
commit7a6d89bd1f8730f1b57141992f5c5cb678ab4a82 (patch)
tree41c7d40e5f1762d53d4eb3d1b4c2b80d0bdb578a /lib/ssl
parent7721a7c919df3bfac6f8ced7471d3e5dfcf41bd4 (diff)
parente6a09778df9fc1be772a7d1bdf23b789b6f2b6b2 (diff)
downloadotp-7a6d89bd1f8730f1b57141992f5c5cb678ab4a82.tar.gz
otp-7a6d89bd1f8730f1b57141992f5c5cb678ab4a82.tar.bz2
otp-7a6d89bd1f8730f1b57141992f5c5cb678ab4a82.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/test/ssl_session_cache_SUITE.erl2
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,