diff options
| author | Hans Nilsson <[email protected]> | 2014-11-28 14:44:49 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-11-28 14:44:49 +0100 |
| commit | eac865b040ba663bf9635ca800097acb8bc91c98 (patch) | |
| tree | e19e54c5fd95d33c5aff693cabf5bcffab4f692d /lib/eldap/src | |
| parent | 1a3b8025c61a82debd36739d2c6ab4102f4bb9a8 (diff) | |
| parent | 948c140f207fdae5016780229a8ad803aa80e372 (diff) | |
| download | otp-eac865b040ba663bf9635ca800097acb8bc91c98.tar.gz otp-eac865b040ba663bf9635ca800097acb8bc91c98.tar.bz2 otp-eac865b040ba663bf9635ca800097acb8bc91c98.zip | |
Merge branch 'maint'
* maint:
eldap: Fix timeout missing in ssl:connect
Diffstat (limited to 'lib/eldap/src')
| -rw-r--r-- | lib/eldap/src/eldap.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl index 66f80d8d8f..c636e0e0cd 100644 --- a/lib/eldap/src/eldap.erl +++ b/lib/eldap/src/eldap.erl @@ -477,7 +477,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 |