aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-11-08 14:36:48 +0100
committerIngela Anderton Andin <[email protected]>2018-11-08 14:36:48 +0100
commit8b7cd6224d739b703887a3e2be57ea8f1309a827 (patch)
tree21542b80e75e4f834f1a05dd6b880125bdebaacd /lib/ssl
parent55d97726f4a660c3204b2290f81ac1cc01318aed (diff)
parent2160558e72b6d14815761138d5e0370ab89be730 (diff)
downloadotp-8b7cd6224d739b703887a3e2be57ea8f1309a827.tar.gz
otp-8b7cd6224d739b703887a3e2be57ea8f1309a827.tar.bz2
otp-8b7cd6224d739b703887a3e2be57ea8f1309a827.zip
Merge branch 'ingela/ssl/erl-dist/ERL-770/OTP-15418' into maint
* ingela/ssl/erl-dist/ERL-770/OTP-15418: ssl: Correct gen_statem return value
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/tls_sender.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_sender.erl b/lib/ssl/src/tls_sender.erl
index 8d1938cee7..a245ee2465 100644
--- a/lib/ssl/src/tls_sender.erl
+++ b/lib/ssl/src/tls_sender.erl
@@ -319,7 +319,7 @@ handle_info({'DOWN', Monitor, _, _, _}, _,
#data{connection_monitor = Monitor} = StateData) ->
{stop, normal, StateData};
handle_info(_,_,_) ->
- {keep_state_and_data}.
+ keep_state_and_data.
send_tls_alert(Alert, #data{negotiated_version = Version,
socket = Socket,