2 votes, promote 1

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

diff --git a/STATUS b/STATUS
index 7d305740a3ae93cab982fe0f85ce4452fc2b09a3..bfcf509ce57de054bd8ace2df491e2493439d17f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -93,6 +93,20 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_cache: * Do not cache 206 responses in any case since we currently do not provide any
+    backends that are capable to cache partial responses. PR 49113.
+    Fixes regression of r724093.
+      Trunk version of patch:
+         http://svn.apache.org/viewcvs.cgi?rev=933919&view=rev
+      Backport version for 2.2.x of patch:
+         Trunk version of patch works
+      +1: rpluem
+      minfrin: The r933919 patch is obsolete, as this trunk code no longer
+               exists. The fix you're after is r951222, backported to both
+               mod_disk_cache.c and mod_mem_cache.c.
+      rjung: I combined backports of r933919 and r951222:
+      http://people.apache.org/~rjung/patches/mod_cache_partial_content-2.2.x.patch
+      +1: rjung, wrowe, sf
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -121,21 +135,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.2.x patch: http://people.apache.org/~druggeri/patches/httpd-2.2-SSLProxyMachineCertificateChainFile.patch
     +1: druggeri, kbrand (non-binding)
 
-  * mod_cache: * Do not cache 206 responses in any case since we currently do not provide any
-    backends that are capable to cache partial responses. PR 49113.
-    Fixes regression of r724093.
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=933919&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem
-      minfrin: The r933919 patch is obsolete, as this trunk code no longer
-               exists. The fix you're after is r951222, backported to both
-               mod_disk_cache.c and mod_mem_cache.c.
-      rjung: I combined backports of r933919 and r951222:
-      http://people.apache.org/~rjung/patches/mod_cache_partial_content-2.2.x.patch
-      +1: rjung, wrowe
-
   * mod_proxy_ajp: Missing support for ErrorOverride
     Trunk patch: http://svn.apache.org/viewvc?rev=1087864&view=rev
     2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=27976
@@ -165,7 +164,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        http://svn.apache.org/viewvc?rev=1306409&view=rev
     Backport version for 2.2.x of patch:
        http://people.apache.org/~rpluem/patches/forcerecovery_2.2.diff
-    +1: rpluem,
+    +1: rpluem, sf
+    sf notes: The docs should get a compatibility note once it is clear
+              in which 2.2.x version it gets introduced.
 
    * mod_ssl: Add support for Next Protocol Negotiation.
      Trunk patch: