From: Paul J. Reder <rederpj@apache.org>
Date: Tue, 25 Nov 2003 17:53:25 +0000 (+0000)
Subject: Sync with APACHE_2_0_BRANCH.
X-Git-Tag: pre_ajp_proxy~999
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91aa761bab89b787aed1ecea80ba59e85bbb53d9;p=apache

Sync with APACHE_2_0_BRANCH.


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

diff --git a/CHANGES b/CHANGES
index a73f1f07c4..2937e9517a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,11 +15,6 @@ Changes with Apache 2.1.0-dev
   *) SECURITY [CAN-2003-0020]: Escape arbitrary data before writing
      into the errorlog.  [André Malo]
 
-  *) mod_expires: Initialize ExpiresDefault to NULL instead of "" to
-     avoid reporting an Internal Server error if it is used without
-     having been set in the httpd.conf file. PR: 23748, 24459
-     [Andre Malo, Liam Quinn  <liam htmlhelp.com>]
-
   *) mod_logio: Account for some bytes handed to the network layer prior to
      dropped connections.  [Jeff Trawick]
 
@@ -259,6 +254,11 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_expires: Initialize ExpiresDefault to NULL instead of "" to
+     avoid reporting an Internal Server error if it is used without
+     having been set in the httpd.conf file. PR: 23748, 24459
+     [Andre Malo, Liam Quinn  <liam htmlhelp.com>]
+
   *) mod_autoindex: Don't omit the <tr> start tag if the SuppressIcon
      option is set. PR 21668.  [Jesse Tie-Ten-Quee <highos highos.com>]