diff options
| author | Erlang/OTP <[email protected]> | 2019-05-06 17:09:06 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-05-06 17:09:06 +0200 |
| commit | 4477548c1bfe92684b85d6041fbd69dc4f0d6443 (patch) | |
| tree | d3d2f1b05e1b9a85dce0c273339a3f7a8a5384ca /lib/ssl/src/tls_connection.erl | |
| parent | 9363dceecf650e364f4a5e3348fc6e18fead3696 (diff) | |
| parent | 01d2d677916d5143b6e501bb7230d1ad13592ede (diff) | |
| download | otp-4477548c1bfe92684b85d6041fbd69dc4f0d6443.tar.gz otp-4477548c1bfe92684b85d6041fbd69dc4f0d6443.tar.bz2 otp-4477548c1bfe92684b85d6041fbd69dc4f0d6443.zip | |
Merge branch 'ingela/ssl/backported-ssl-enhancments/ERL-929/ERL-893/PR-2215/OTP-15785' into maint-21
* ingela/ssl/backported-ssl-enhancments/ERL-929/ERL-893/PR-2215/OTP-15785:
ssl: Fix cherry-pick mistakes
ssl: Refer documentation of HttpPacket from erts
ssl: Update type spec of ssl:suite_to_str/1
ssl: Update function ssl:eccs/1
ssl: Fix type specs of ssl_internal.hrl
ssl: Fix type specs of internal handshake functions
ssl: Fix dialyzer warnings
eldap: Fix dialyzer warnings
ssl: Fix missing anchor warning
public_key: Accept digest types 'sha1' and 'sha'
inet: Document type inet:stat_option()
ssl: Changed function specs and ssl.xml
ssl: Add missing tuple in shutdown reason
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 15e3f30651..52e5db731a 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -762,7 +762,7 @@ downgrade(Type, Event, State) -> callback_mode() -> state_functions. -terminate({shutdown, sender_died, Reason}, _StateName, +terminate({shutdown, {sender_died, Reason}}, _StateName, #state{static_env = #static_env{socket = Socket, transport_cb = Transport}} = State) -> @@ -941,7 +941,7 @@ handle_info({CloseTag, Socket}, StateName, end; handle_info({'EXIT', Sender, Reason}, _, #state{protocol_specific = #{sender := Sender}} = State) -> - {stop, {shutdown, sender_died, Reason}, State}; + {stop, {shutdown, {sender_died, Reason}}, State}; handle_info(Msg, StateName, State) -> ssl_connection:StateName(info, Msg, State, ?MODULE). |