Commit ed417f39 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 2059491c

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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]

STATUS

+0 −4
Changes for STATUS: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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:

modules/ldap/util_ldap.c

+2 −1
Changes for modules/ldap/util_ldap.c: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -163,11 +163,12 @@ 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);

#endif

}

}





/*