sync

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

diff --git a/CHANGES b/CHANGES
index 8797ce955a95a8140619abb50d06c2d6f7a78a04..e14895dd9ef343d8076351deadaaa1b450c9d248 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -38,9 +38,6 @@ Changes with Apache 2.1.0-dev
      SSL library used at run-time, rather than at compile-time.
      PR: 23956  [Eric Seidel <eseidel apple.com>]
 
-  *) SECURITY [CAN-2003-0020]: Escape arbitrary data before writing
-     into the errorlog.  [André Malo]
-
   *) mod_logio: Account for some bytes handed to the network layer prior to
      dropped connections.  [Jeff Trawick]
 
@@ -56,9 +53,6 @@ Changes with Apache 2.1.0-dev
   *) mod_auth_ldap: Fix some segfaults in the cache logic.  PR 18756.
      [Matthieu Estrade <apache moresecurity.org>]
 
-  *) mod_autoindex: Restore the ability to add a description for
-     directories that don't contain an index file.  [André Malo]
-
   *) mod_autoindex: Add 'XHTML' option in order to allow switching between
      HTML 3.2 and XHTML 1.0 output. PR 23747.  [André Malo]
 
@@ -69,9 +63,6 @@ Changes with Apache 2.1.0-dev
      treated the supplied regex as literal string. PR 24219.
      [André Malo]
 
-  *) mod_autoindex / core: Don't fail to show filenames containing
-     special characters like '%'. PR 13598.  [André Malo]
-
   *) mod_ssl: Fix segfault on a non-SSL request if the the 'c' log
      format code is used. PR 22741. [Gary E. Miller <gem rellim.com>]
 
@@ -259,6 +250,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) SECURITY [CAN-2003-0020]: Escape arbitrary data before writing
+     into the errorlog.  [André Malo]
+
+  *) mod_autoindex / core: Don't fail to show filenames containing
+     special characters like '%'. PR 13598.  [André Malo]
+ 
   *) mod_status: Report total CPU time accurately when using a threaded
      MPM.  PR 23795.  [Jeff Trawick]