From 8124941f68eaec82ae372424979bf745db9ba9eb Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Thu, 27 Nov 2014 19:10:36 +0100 Subject: eldap: Fix timeout missing in ssl:connect --- lib/eldap/src/eldap.erl | 3 ++- 1 file changed, 2 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 3fa440d37d..9f7aca287b 100644 --- a/lib/eldap/src/eldap.erl +++ b/lib/eldap/src/eldap.erl @@ -459,7 +459,8 @@ do_connect(Host, Data, Opts) when Data#eldap.ldaps == false -> Data#eldap.timeout); do_connect(Host, Data, Opts) when Data#eldap.ldaps == true -> ssl:connect(Host, Data#eldap.port, - Opts ++ Data#eldap.tls_opts ++ Data#eldap.tcp_opts). + Opts ++ Data#eldap.tls_opts ++ Data#eldap.tcp_opts, + Data#eldap.timeout). loop(Cpid, Data) -> receive -- cgit v1.2.3