Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1056684 - /httpd/httpd/branches/2.2.x/STATUS
Date: Sat, 08 Jan 2011 10:30:48 -0000
To: cvs@httpd.apache.org
From: rpluem@apache.org
Message-Id: <20110108103048.DDA5B23889B3@eris.apache.org>

Author: rpluem
Date: Sat Jan  8 10:30:48 2011
New Revision: 1056684

URL: http://svn.apache.org/viewvc?rev=1056684&view=rev
Log:
* Comments are now resolved, so move it back

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1056684&r1=1056683&r2=1056684&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Jan  8 10:30:48 2011
@@ -90,6 +90,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_cache: Make sure that we never allow a 304 Not Modified response
+     that we asked for to leak to the client should the 304 response be
+     uncacheable.
+     PR45341
+     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1001884
+     2.2.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-304-fix-2.patch
+     +1: minfrin, jim, covener
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -204,19 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          Trunk version of patch works
       +1: rpluem,
 
-   * mod_cache: Make sure that we never allow a 304 Not Modified response
-     that we asked for to leak to the client should the 304 response be
-     uncacheable.
-     PR45341
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1001884
-     2.2.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-304-fix-2.patch
-     +1: minfrin, jim, covener
-     rpluem says: The new patch works, but still compiles with a waring:
-                  mod_cache.c: In function `cache_save_filter':
-                  mod_cache.c:628: warning: implicit declaration of function `cache_remove_lock'
-                  This will cause mod_cache.so to be unusable.
-                  Instead of cache_remove_lock it must be ap_cache_remove_lock.
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of