From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Fri, 4 Feb 2005 00:30:33 +0000 (+0000)
Subject: Sync CHANGES with 2.0.x.
X-Git-Tag: 2.1.3~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcfcf2b48fd335855116cde4c95d3c2fe5f68296;p=thirdparty%2Fapache%2Fhttpd.git

Sync CHANGES with 2.0.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151273 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 67e48d33c39..8224f78692d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -162,9 +162,6 @@ Changes with Apache 2.1.1
   *) mod_rewrite: Removed the MaxRedirects option in favor of the
      core LimitInternalRecursion directive.  [André Malo]
 
-  *) mod_auth_ldap: Handle the inconsistent way in which the MS LDAP
-     library handles special characters. PR 24437 [Jess Holle]
-
   *) Unix MPMs: Shut down the server more quickly when child processes are
      slow to exit.  [Joe Orton, Jeff Trawick]
 
@@ -564,6 +561,9 @@ Changes with Apache 2.1.1
 
 Changes with Apache 2.0.53
 
+  *) mod_auth_ldap: Handle the inconsistent way in which the MS LDAP
+     library handles special characters. PR 24437 [Jess Holle]
+
   *) Win32 MPM: Correct typo in debugging output.  [William Rowe]
 
   *) conf: Remove AddDefaultCharset from the default configuration because