From b7ebba0417f56631fb4ac9488e64c562821a55a5 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Mon, 15 Jun 2015 18:21:27 +0000 Subject: [PATCH] LDAP connection pool did not release/close connections with "LDAPConnectionPoolTTL 0". PR58037. Submitted by: Ted Phelps committed by: covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685650 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/ldap/util_ldap.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 48fda0718f..d178390318 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) mod_ldap: Stop leaking LDAP connections when 'LDAPConnectionPoolTTL 0' + is configured. PR 58037. [Ted Phelps ] + *) core: Allow spaces after chunk-size for compatibility with implementations using a pre-filled buffer, and log parsing failures at level INFO. [Yann Ylavic, Jeff Trawick] diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index ba11cd29a5..0281245b5b 100644 --- a/modules/ldap/util_ldap.c +++ b/modules/ldap/util_ldap.c @@ -163,10 +163,11 @@ static void uldap_connection_close(util_ldap_connection_t *ldc) /* mark our connection as available for reuse */ ldc->freed = apr_time_now(); ldc->r = NULL; + } + #if APR_HAS_THREADS - apr_thread_mutex_unlock(ldc->lock); + apr_thread_mutex_unlock(ldc->lock); #endif - } } -- 2.40.0