vote & promote

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

diff --git a/STATUS b/STATUS
index be5db8e4487408bd76c53dbdab4a6569bd00d42a..7ca85327ac64f9b2500d93c1007ce6fe8d992944 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -87,6 +87,20 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * mod_cache: treat s-maxage as an explicit expiration in cacheability
+              decisions, per RFC 2616
+   Trunk Patch: http://svn.apache.org/viewvc?rev=823536&view=rev
+                http://svn.apache.org/viewvc?rev=823563&view=rev
+   2.2.x Patch: http://people.apache.org/~poirier/smaxage.patch
+                (trunk patch works, except for CHANGES)
+   +1: poirier, sf, covener
+
+ * mod_rewrite: don't fully qualify hostname:port if the request is a CONNECT
+                request
+   Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=822004
+   2.2.x Patch: trunk patch works
+   +1: sf, minfrin, covener
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -122,20 +136,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    2.2.x Patch: http://people.apache.org/~minfrin/httpd-cache-thundering.patch
    +1: minfrin
 
- * mod_rewrite: don't fully qualify hostname:port if the request is a CONNECT
-                request
-   Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=822004
-   2.2.x Patch: trunk patch works
-   +1: sf, minfrin
-
- * mod_cache: treat s-maxage as an explicit expiration in cacheability
-              decisions, per RFC 2616
-   Trunk Patch: http://svn.apache.org/viewvc?rev=823536&view=rev
-                http://svn.apache.org/viewvc?rev=823563&view=rev
-   2.2.x Patch: http://people.apache.org/~poirier/smaxage.patch
-                (trunk patch works, except for CHANGES)
-   +1: poirier, sf
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * srclib/pcre and vendor/pcre