From: Bill Stoddard <stoddard@apache.org>
Date: Fri, 24 Sep 2004 14:29:26 +0000 (+0000)
Subject: port complete
X-Git-Tag: 2.0.53~257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=377f7029634ce4851bccd2bc9335fe4e0a0b2dfa;p=thirdparty%2Fapache%2Fhttpd.git

port complete


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

diff --git a/CHANGES b/CHANGES
index 1968c87b144..b6944fad7ab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@ Changes with Apache 2.0.53
 
   *) Fix Expires handling in mod_cache.  [Justin Erenkrantz]
 
+  *) Alter mod_expires to run at a different filter priority to allow
+     proper Expires storage by mod_cache.  [Justin Erenkrantz]
+
 Changes with Apache 2.0.52
 
   *) Use HTML 2.0 <hr> for error pages. PR 30732 [André Malo]
diff --git a/STATUS b/STATUS
index 6728f8df454..d5a42ebe991 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/09/24 13:11:35 $]
+Last modified at [$Date: 2004/09/24 14:29:26 $]
 
 Release:
 
@@ -301,11 +301,6 @@ PATCHES TO BACKPORT FROM 2.1
       which integrates the two rounds of changes)
       +1 concept: trawick, nd, stoddard
 
-    * mod_expires: Allow mod_cache to properly cache Expire responses by making
-      ExpiresFilter run before mod_cache's cache_save_filter.
-      modules/metadata/mod_expires.c: r1.55
-      +1: jerenkrantz, trawick, stoddard
-
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,