Merge r1685650 from trunk:

LDAP connection pool did not release/close connections with
"LDAPConnectionPoolTTL 0".  PR58037.

Submitted by: Ted Phelps <phelps gnusto.com>
committed by: covener

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686275 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 05409abdb61c8cc4236fc813b48aaadb052cb1e3..123086bc74a0273ccde9c434677249262e509983 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Changes with Apache 2.4.15
      data during read of chunked request bodies. PR 58049. 
      [Edward Lu <Chaosed0 gmail.com>]
 
+  *) mod_ldap: Stop leaking LDAP connections when 'LDAPConnectionPoolTTL 0' 
+     is configured.  PR 58037.  [Ted Phelps <phelps gnusto.com>]
+
   *) core: Allow spaces after chunk-size for compatibility with implementations
      using a pre-filled buffer.  [Yann Ylavic, Jeff Trawick]
 

diff --git a/STATUS b/STATUS
index 8d2ceb39b93bb7c1e7bbf66b1c5dbf20570b0287..907409e832dfa82f4dd5cdd636044f6eabd2cd10 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -107,10 +107,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_ldap: Fix "LDAPConnectionPoolTTL 0" LDAP connection leak.
-     trunk patch: http://svn.apache.org/r1685650
-     2.4.x patch: trunk works
-     +1: covener, ylavic, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index ee4418985a5fe2e678560c47afe614e7df9e7f7b..d9359b2ffa4711aa2d429f4c45ecc28fec8d48eb 100644 (file)
--- 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
-     }
 }