aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-08-09 09:27:23 +0200
committerIngela Anderton Andin <[email protected]>2018-08-09 09:27:23 +0200
commitca9f2fe073b587e70b5502c87be3eca6f72ddd57 (patch)
tree972b38f339e8a83d8e85862867253739e479a986 /lib/ssl/src
parentc5c0e67aeb5163b23d98cc2d7a4c9b2b10f1e241 (diff)
parent8efc1ab04cbc529d28568b038d54139d238087f1 (diff)
downloadotp-ca9f2fe073b587e70b5502c87be3eca6f72ddd57.tar.gz
otp-ca9f2fe073b587e70b5502c87be3eca6f72ddd57.tar.bz2
otp-ca9f2fe073b587e70b5502c87be3eca6f72ddd57.zip
Merge branch 'ingela/ssl/error-state/ERL-685/OTP-15216' into maint
* ingela/ssl/error-state/ERL-685/OTP-15216: ssl: Correct close handling
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl_connection.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 064350e6de..4b3a6cde01 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -634,6 +634,8 @@ init(_Type, _Event, _State, _Connection) ->
tls_connection | dtls_connection) ->
gen_statem:state_function_result().
%%--------------------------------------------------------------------
+error({call, From}, {close, _}, State, _Connection) ->
+ stop_and_reply(normal, {reply, From, ok}, State);
error({call, From}, _Msg, State, _Connection) ->
{next_state, ?FUNCTION_NAME, State, [{reply, From, {error, closed}}]}.