From: André Malo <nd@apache.org>
Date: Thu, 31 Jul 2003 23:50:45 +0000 (+0000)
Subject: sync
X-Git-Tag: pre_ajp_proxy~1309
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5bdd1ae85c7cc6b70c63d1df0dd53fc547807c5;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index 76b27e6d56..7fe007c2be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,13 +17,6 @@ Changes with Apache 2.1.0-dev
   *) mod_ssl: Fix segfaults after renegotiation failure. PR 21370
      [Hartmut Keil <Hartmut.Keil@adnovum.ch>]
 
-  *) ab: Overlong credentials given via command line no longer clobber
-     the buffer. [André Malo]
-
-  *) mod_rewrite: Ignore RewriteRules in .htaccess files if the directory
-     containing the .htaccess file is requested without a trailing slash.
-     PR 20195.  [André Malo]
-
   *) mod_autoindex: If a directory contains a file listed in the
      DirectoryIndex directive, the folder icon is no longer replaced
      by the icon of that file. PR 9587.
@@ -197,6 +190,13 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.48
 
+  *) mod_rewrite: Ignore RewriteRules in .htaccess files if the directory
+     containing the .htaccess file is requested without a trailing slash.
+     PR 20195.  [André Malo]
+
+  *) ab: Overlong credentials given via command line no longer clobber
+     the buffer.  [André Malo]
+
   *) mod_deflate: Don't attempt to hold all of the response until we're
      done.  [Justin Erenkrantz]