aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-06-02 14:47:16 +0200
committerHenrik Nord <[email protected]>2015-06-02 14:47:20 +0200
commit237353645b9b290038ba70250747b2ea07488625 (patch)
tree4c581073d85d826092ea18146db27b4dd1dd70c9
parent00872fbaa648c47f49adf221656b186810ccfc9d (diff)
parentfc4336a56f3000316fb1d1bb2537f2b35aab0d16 (diff)
downloadotp-237353645b9b290038ba70250747b2ea07488625.tar.gz
otp-237353645b9b290038ba70250747b2ea07488625.tar.bz2
otp-237353645b9b290038ba70250747b2ea07488625.zip
Merge branch 'tombriden/handle_ssl_error'
* tombriden/handle_ssl_error: TLS Dist: Handle ssl_error and close ssl socket OTP-12799
-rw-r--r--lib/ssl/src/ssl_tls_dist_proxy.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
index a22af6b960..d23b42ace5 100644
--- a/lib/ssl/src/ssl_tls_dist_proxy.erl
+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl
@@ -227,7 +227,10 @@ loop_conn_setup(World, Erts) ->
{tcp_closed, Erts} ->
ssl:close(World);
{ssl_closed, World} ->
- gen_tcp:close(Erts)
+ gen_tcp:close(Erts);
+ {ssl_error, World, _} ->
+
+ ssl:close(World)
end.
loop_conn(World, Erts) ->
@@ -241,7 +244,9 @@ loop_conn(World, Erts) ->
{tcp_closed, Erts} ->
ssl:close(World);
{ssl_closed, World} ->
- gen_tcp:close(Erts)
+ gen_tcp:close(Erts);
+ {ssl_error, World, _} ->
+ ssl:close(World)
end.
get_ssl_options(Type) ->