diff options
| author | Henrik Nord <[email protected]> | 2012-02-14 11:01:20 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-02-14 11:04:18 +0100 |
| commit | 8425d4b6b26a9eea2c707fc343776fc404c0fbad (patch) | |
| tree | b267f2cb49332adf3afe3bd2cb7502fdac89b9bc /lib | |
| parent | 77cd9f071c653810c7db99a635b73320e1a1863e (diff) | |
| parent | b37d0448db27aeaa364c7e2cd2017ed0596aa288 (diff) | |
| download | otp-8425d4b6b26a9eea2c707fc343776fc404c0fbad.tar.gz otp-8425d4b6b26a9eea2c707fc343776fc404c0fbad.tar.bz2 otp-8425d4b6b26a9eea2c707fc343776fc404c0fbad.zip | |
Merge branch 'pg/fix-ssl_tls_dist_proxy-setup-loop' into maint
* pg/fix-ssl_tls_dist_proxy-setup-loop:
Fix setup loop of SSL TLS dist proxy
OTP-9915
OTP-9916
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl_tls_dist_proxy.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl index aa762f26d7..1c61eb7ccc 100644 --- a/lib/ssl/src/ssl_tls_dist_proxy.erl +++ b/lib/ssl/src/ssl_tls_dist_proxy.erl @@ -223,7 +223,11 @@ loop_conn_setup(World, Erts) -> loop_conn_setup(World, Erts); {tcp, Erts, Data} -> ssl:send(World, Data), - loop_conn_setup(World, Erts) + loop_conn_setup(World, Erts); + {tcp_closed, Erts} -> + ssl:close(World); + {ssl_closed, World} -> + gen_tcp:close(Erts) end. loop_conn(World, Erts) -> |