From: Paul J. Reder <rederpj@apache.org>
Date: Wed, 7 Jan 2004 02:51:28 +0000 (+0000)
Subject: Synching with 2.0 branch after backport.
X-Git-Tag: pre_ajp_proxy~856
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e2d4534df1f753e3334c0e02b18de63db6237f9;p=apache

Synching with 2.0 branch after backport.


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

diff --git a/CHANGES b/CHANGES
index 491e2c833d..18794ebec8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,12 +25,6 @@ Changes with Apache 2.1.0-dev
      respawning again after Apache is stopped.  PR 21648, PR 24805.
      [Jeff Trawick]
 
-  *) Add a hook (insert_error_filter) to allow filters to re-insert
-     themselves during processing of error responses. Enable mod_expires
-     to use the new hook to include Expires headers in valid error
-     responses. This addresses an RFC violation. It fixes PRs 19794,
-     24884, and 25123. [Paul J. Reder]
-
   *) Fix <Limit> and <LimitExcept> parsing to require a closing '>' 
      in the initial container.  PR 25414. 
      [Geoffrey Young <geoff apache.org>]
@@ -259,6 +253,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) Add a hook (insert_error_filter) to allow filters to re-insert
+     themselves during processing of error responses. Enable mod_expires
+     to use the new hook to include Expires headers in valid error
+     responses. This addresses an RFC violation. It fixes PRs 19794,
+     24884, and 25123. [Paul J. Reder]
+
   *) Add AP_MPMQ_MPM_STATE function code for ap_mpm_query. (Not yet
      supported for BeOS, OS/2, or Win32 MPMs.)  [Jeff Trawick,
      Brad Nicholes]