diff options
| author | Raimo Niskanen <[email protected]> | 2018-12-14 14:05:16 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2018-12-14 14:05:16 +0100 |
| commit | 501ff83ade9ee2e8b88bc0c2c6d34f357fc57b6d (patch) | |
| tree | 04b56fcb3fadc25cba64db48ea9cad4c1e52d82e /lib/ssl/src/tls_connection.erl | |
| parent | 96db55840b25fa8bde5bbbf93c9bd92782e3147c (diff) | |
| parent | 70e2bff30c8f522a7f614ff384e8cd9e08184b9c (diff) | |
| download | otp-501ff83ade9ee2e8b88bc0c2c6d34f357fc57b6d.tar.gz otp-501ff83ade9ee2e8b88bc0c2c6d34f357fc57b6d.tar.bz2 otp-501ff83ade9ee2e8b88bc0c2c6d34f357fc57b6d.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl_connection.hrl
lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 457f3cf8b9..ea56aba34f 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -885,7 +885,6 @@ initial_state(Role, Sender, Host, Port, Socket, {SSLOptions, SocketOptions, Trac #ssl_options{beast_mitigation = BeastMitigation, erl_dist = IsErlDist} = SSLOptions, ConnectionStates = tls_record:init_connection_states(Role, BeastMitigation), - ErlDistData = erl_dist_data(IsErlDist), SessionCacheCb = case application:get_env(ssl, session_cb) of {ok, Cb} when is_atom(Cb) -> Cb; @@ -917,7 +916,6 @@ initial_state(Role, Sender, Host, Port, Socket, {SSLOptions, SocketOptions, Trac socket_options = SocketOptions, ssl_options = SSLOptions, session = #session{is_resumable = new}, - erl_dist_data = ErlDistData, connection_states = ConnectionStates, protocol_buffers = #protocol_buffers{}, user_application = {UserMonitor, User}, @@ -932,12 +930,6 @@ initial_state(Role, Sender, Host, Port, Socket, {SSLOptions, SocketOptions, Trac } }. -erl_dist_data(true) -> - #{dist_handle => undefined, - dist_buffer => <<>>}; -erl_dist_data(false) -> - #{}. - initialize_tls_sender(#state{static_env = #static_env{ role = Role, transport_cb = Transport, |