From: Jim Jagielski <jim@apache.org>
Date: Fri, 18 May 2007 12:36:48 +0000 (+0000)
Subject: This has the votes...
X-Git-Tag: 2.2.5~208
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a57f9ceb60b0db05491163244a6877221bd5d045;p=thirdparty%2Fapache%2Fhttpd.git

This has the votes...


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

diff --git a/STATUS b/STATUS
index 9ddc95a83ed..b7b0263ad8e 100644
--- a/STATUS
+++ b/STATUS
@@ -86,6 +86,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       +1: jfclere, rpluem, wrowe
       jerenkrantz says: Does not apply cleanly to 2.2.x.
 
+   * mod_cache: Let Cache-Control max-age set the expiration date.
+     Trunk version of patch:
+       http://svn.apache.org/viewvc?view=rev&revision=539063
+     2.2.x version of patch:
+       http://people.apache.org/~jerenkrantz/max-age-expire-2.2.x.patch
+       (No ->minex in 2.2.x)
+     +1: jerenkrantz, fielding, striker
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * ApacheMonitor: Fix Windows Vista detection.
@@ -228,14 +236,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        http://people.apache.org/~chrisd/patches/mod_dbd_pools_groups/mod_dbd-4groups-2.2.x.patch
      +1: chrisd
 
-   * mod_cache: Let Cache-Control max-age set the expiration date.
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=539063
-     2.2.x version of patch:
-       http://people.apache.org/~jerenkrantz/max-age-expire-2.2.x.patch
-       (No ->minex in 2.2.x)
-     +1: jerenkrantz, fielding, striker
-
 PATCHES/ISSUES THAT ARE STALLED
 
     * PKCS#7: backport PCKS#7 patches from trunk.