sync with 2.0 branch

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

diff --git a/CHANGES b/CHANGES
index 988ea762a189f87316c6d2522995840cc44b9d3d..9226be9ee29a992459937a09afa206b614fb307c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -54,11 +54,6 @@ Changes with Apache 2.1.0-dev
   *) Enable the option to support anonymous shared memory in mod_ldap.
      This makes the cache work on Linux again. [Graham Leggett]
 
-  *) Small fix to allow reverse proxying to an ftp server. Previously
-     an attempt to do this would try and connect to 0.0.0.0, regardless
-     of the server specified. PR 24922
-     [Pascal Terjan <pterjan@linuxfr.org>]
-
   *) External rewrite map responses are no longer limited to 2048
      bytes.  [André Malo]
 
@@ -391,6 +386,11 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.51
 
+  *) Small fix to allow reverse proxying to an ftp server. Previously
+     an attempt to do this would try and connect to 0.0.0.0, regardless
+     of the server specified. PR 24922
+     [Pascal Terjan <pterjan@linuxfr.org>]
+
   *) Add the NOTICE file to the rpm spec file in compliance with the
      Apache v2.0 license. [Graham Leggett]