diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-03-19 12:19:25 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-03-19 12:19:25 +0100 |
| commit | 14713b3b284b7c92b61566b4a6a41e39056a10ca (patch) | |
| tree | 10e15ae556b5f621acc447846bdc5169df7de33c /lib/ssl/test | |
| parent | 47b496da10cfedeea8a0341ce13c76de3c132a57 (diff) | |
| parent | dbe7c4610f030997b9c22b3d5a06628933acc6e0 (diff) | |
| download | otp-14713b3b284b7c92b61566b4a6a41e39056a10ca.tar.gz otp-14713b3b284b7c92b61566b4a6a41e39056a10ca.tar.bz2 otp-14713b3b284b7c92b61566b4a6a41e39056a10ca.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl.erl
lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index b566e817f7..ff5638ff34 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -4086,7 +4086,7 @@ tls_tcp_error_propagation_in_active_mode(Config) when is_list(Config) -> [_, _,_, _, Prop] = StatusInfo, State = ssl_test_lib:state(Prop), StaticEnv = element(2, State), - Socket = element(10, StaticEnv), + Socket = element(11, StaticEnv), %% Fake tcp error Pid ! {tcp_error, Socket, etimedout}, |