Merge branch 'maint'

Conflicts:
	lib/ssl/test/ssl_dist_bench_SUITE.erl

1 files changed, 11 insertions, 7 deletions

diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index 296a68e8f3..ae784380c8 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -406,13 +406,11 @@ send_alert_in_connection(#alert{description = ?CLOSE_NOTIFY} = Alert, State) ->
 send_alert_in_connection(Alert,
                          #state{protocol_specific = #{sender := Sender}}) ->
     tls_sender:send_alert(Sender, Alert).
-send_sync_alert(Alert, #state{protocol_specific = #{sender := Sender}}= State) ->
-    tls_sender:send_and_ack_alert(Sender, Alert),
-    receive
-        {Sender, ack_alert} ->
-            ok
-    after ?DEFAULT_TIMEOUT ->
-            %% Sender is blocked terminate anyway
+send_sync_alert(
+  Alert, #state{protocol_specific = #{sender := Sender}} = State) ->
+    try tls_sender:send_and_ack_alert(Sender, Alert)
+    catch
+        _:_ ->
             throw({stop, {shutdown, own_alert}, State})
     end.
 
@@ -808,6 +806,12 @@ wait_sh(Type, Event, State) ->
 callback_mode() ->
     state_functions.
 
+
+terminate(
+  {shutdown, sender_died, Reason}, _StateName,
+  #state{socket = Socket, transport_cb = Transport} = State) ->
+    ssl_connection:handle_trusted_certs_db(State),
+    close(Reason, Socket, Transport, undefined, undefined);
 terminate(Reason, StateName, State) ->
     catch ssl_connection:terminate(Reason, StateName, State),
     ensure_sender_terminate(Reason, State).