account for a couple of fixes moved back to 2.0.46-dev

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

diff --git a/CHANGES b/CHANGES
index e417655f30cbf9b6fcb8e9155fcad62c84135121..1263208f9a0a322bba91aa096da6c575b44a767a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -27,8 +27,6 @@ Changes with Apache 2.1.0-dev
      came out mangled in the PROPFIND response.  PR 11637.
      [Amit Athavale <amit_athavale@persistent.co.in>]
 
-  *) forward port of buffer overflow fixes for htdigest. [Thom May]
-
   *) prefork MPM: Use the right permissions for the directory created 
      for gprof support.  [Jim Carlson <jcarlson@jnous.com>]
 
@@ -36,10 +34,6 @@ Changes with Apache 2.1.0-dev
      The user can override with CC and CPP environment variables.
      [Jeff Trawick]
 
-  *) Fix ap_construct_url() so that it surrounds IPv6 literal address
-     strings with [].  This fixes certain types of redirection.
-     PR 19207.  [Jeff Trawick]
-
   *) mod_log_config: Add the ability to log the id of the thread 
      processing the request via new %P formats.  [Jeff Trawick]
 
@@ -182,6 +176,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) Fix ap_construct_url() so that it surrounds IPv6 literal address
+     strings with [].  This fixes certain types of redirection.
+     PR 19207.  [Jeff Trawick]
+
+  *) forward port of buffer overflow fixes for htdigest. [Thom May]
+
   *) Added AllowEncodedSlashes directive to permit control of whether
      the server will accept encoded slashes ('%2f') in the URI path.
      Default condition is off (the historical behaviour).  This permits