Commit caa72a7c authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160713 13f79535-47bb-0310-9956-ffa450edef68
parent 228643f8
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -113,10 +113,6 @@ Changes with Apache 2.1.3
  *) mod_cache: Add CacheStorePrivate and CacheStoreNoStore directive.
     [Justin Erenkrantz]
  *) mod_ldap: Added the directive LDAPConnectionTimeout to configure
     the ldap socket connection timeout value.  
     [Brad Nicholes]
  *) Add --enable-pie flag to configure, to build httpd as a Position
     Independent Executable where supported (GCC/binutils).
     [Joe Orton]
@@ -649,6 +645,10 @@ Changes with Apache 2.1.1
Changes with Apache 2.0.54
  *) mod_ldap: Added the directive LDAPConnectionTimeout to configure
     the ldap socket connection timeout value.  
     [Brad Nicholes]
  *) worker MPM: Fix a problem which could cause httpd processes to
     remain active after shutdown.  [Jeff Trawick]