From: André Malo <nd@apache.org>
Date: Fri, 21 Nov 2003 23:53:36 +0000 (+0000)
Subject: sync
X-Git-Tag: pre_ajp_proxy~1023
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86cf5be6dc9e4c11795422b04b2dc98b69ba449a;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index d3bc1a0e45..6a5d8071b9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,9 +30,6 @@ Changes with Apache 2.1.0-dev
   *) mod_autoindex: Restore the ability to add a description for
      directories that don't contain an index file.  [André Malo]
 
-  *) mod_include no longer allows an ETag header on 304 responses.
-     PR 19355. [Geoffrey Young <geoff apache.org>, 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]
 
@@ -43,9 +40,6 @@ Changes with Apache 2.1.0-dev
      treated the supplied regex as literal string. PR 24219.
      [André Malo]
 
-  *) mod_autoindex: Don't omit the <tr> start tag if the SuppressIcon
-     option is set. PR 21668.  [Jesse Tie-Ten-Quee <highos highos.com>]
-
   *) mod_autoindex / core: Don't fail to show filenames containing
      special characters like '%'. PR 13598.  [André Malo]
 
@@ -251,6 +245,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_autoindex: Don't omit the <tr> start tag if the SuppressIcon
+     option is set. PR 21668.  [Jesse Tie-Ten-Quee <highos highos.com>]
+
+  *) mod_include no longer allows an ETag header on 304 responses.
+     PR 19355. [Geoffrey Young <geoff apache.org>, André Malo]
+
   *) EBCDIC: Convert header fields to ASCII before sending (broken
      since 2.0.44). [Martin Kraemer]