aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-05-23 11:53:22 +0200
committerIngela Anderton Andin <[email protected]>2016-05-23 11:53:22 +0200
commit6aeb091fd69ad2fcb7cb087822cf51ff4acb1a1a (patch)
tree4e4a56faceeb6c3af5c6c4badbcd45e643e454a1
parentd2d183899ff81a5d0f983943f186e9b83d97c6ef (diff)
parente63b07167e3bcfc848ae6f0f08981d04fab991bc (diff)
downloadotp-6aeb091fd69ad2fcb7cb087822cf51ff4acb1a1a.tar.gz
otp-6aeb091fd69ad2fcb7cb087822cf51ff4acb1a1a.tar.bz2
otp-6aeb091fd69ad2fcb7cb087822cf51ff4acb1a1a.zip
Merge branch 'ingela/ssl-httpc/ERL-144'
* ingela/ssl-httpc/ERL-144: ssl: Send correct close message
-rw-r--r--lib/ssl/src/tls_connection.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index 208edc644a..40f3eea527 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -922,7 +922,7 @@ alert_user(Transport, Tracker, Socket,_, _, _, From, Alert, Role) ->
alert_user(Transport, Tracker, Socket, From, Alert, Role) ->
alert_user(Transport, Tracker, Socket, false, no_pid, From, Alert, Role).
-alert_user(_, _, _, false = Active, Pid, From, Alert, Role) ->
+alert_user(_, _, _, false = Active, Pid, From, Alert, Role) when From =/= undefined ->
%% If there is an outstanding ssl_accept | recv
%% From will be defined and send_or_reply will
%% send the appropriate error message.