From 33b282356b786b831fe8f5414fa60397c4c7eaf9 Mon Sep 17 00:00:00 2001 From: Daniil Fedotov Date: Tue, 3 May 2016 13:28:09 +0100 Subject: Ignore tcp errors during close request to eldap If underlying tcp connection is closed and LDAP operation returned tcp error, then client applications tend to close ldap handle with eldap:close. This will cause do_unbind to throw gen_tcp_error, which is unhandled and will be sent to linked process as {nocatch, {gen_tcp_error, ...}}. eldap should ignore gen_tcp_error during close, because it will be closing anyway. --- lib/eldap/src/eldap.erl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/eldap/src/eldap.erl') diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl index dc236f8a44..8994df10eb 100644 --- a/lib/eldap/src/eldap.erl +++ b/lib/eldap/src/eldap.erl @@ -564,7 +564,12 @@ loop(Cpid, Data) -> ?MODULE:loop(Cpid, NewData); {_From, close} -> - {no_reply,_NewData} = do_unbind(Data), + % Ignore tcp error if connection is already closed. + try do_unbind(Data) of + {no_reply,_NewData} -> ok + catch + throw:{gen_tcp_error, _TcpErr} -> ok + end, unlink(Cpid), exit(closed); -- cgit v1.2.3 From cf754c142b387855f1eb2ea87025efdbdb8e3f4a Mon Sep 17 00:00:00 2001 From: Daniil Fedotov Date: Thu, 5 May 2016 09:47:55 +0100 Subject: indentation --- lib/eldap/src/eldap.erl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/eldap/src/eldap.erl') diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl index 8994df10eb..625309271b 100644 --- a/lib/eldap/src/eldap.erl +++ b/lib/eldap/src/eldap.erl @@ -564,12 +564,12 @@ loop(Cpid, Data) -> ?MODULE:loop(Cpid, NewData); {_From, close} -> - % Ignore tcp error if connection is already closed. - try do_unbind(Data) of - {no_reply,_NewData} -> ok - catch - throw:{gen_tcp_error, _TcpErr} -> ok - end, + % Ignore tcp error if connection is already closed. + try do_unbind(Data) of + {no_reply,_NewData} -> ok + catch + throw:{gen_tcp_error, _TcpErr} -> ok + end, unlink(Cpid), exit(closed); -- cgit v1.2.3