sync with APACHE_2_0_BRANCH

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

diff --git a/CHANGES b/CHANGES
index b8c0aacd65a5092510725a6e387c2443de5427d1..f032e111316f976eff1e264f679399430a2cb4fd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,10 +6,6 @@ Changes with Apache 2.1.0-dev
      set, for example, when processing some error conditions.
      PR 23836.  [Brian Akins <bakins@web.turner.com>, André Malo]
 
-  *) mod_cgid: fix a hash table corruption problem which could
-     result in the wrong script being cleaned up at the end of a
-     request.  [Jeff Trawick]
-
   *) Log an error when requests for URIs which fail to map to a valid 
      filesystem name are rejected with 403.  [Jeff Trawick]
 
@@ -216,6 +212,10 @@ Changes with Apache 2.0.48
      this change mod_perl 2.0's <Perl> sections are broken.
      ["Philippe M. Chiasson" <gozer@cpan.org>]
 
+  *) mod_cgid: fix a hash table corruption problem which could
+     result in the wrong script being cleaned up at the end of a
+     request.  [Jeff Trawick]
+
   *) Update httpd-*.conf to be clearer in describing the connection
      between AddType and AddEncoding for defining the meaning of
      compressed file extensions. [Roy Fielding]