From: Stefan Fritsch <sf@apache.org>
Date: Fri, 19 Aug 2016 16:32:24 +0000 (+0000)
Subject: vote + promote
X-Git-Tag: 2.4.24~307
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6828445aeab2412c4b692323bf989121806b8007;p=thirdparty%2Fapache%2Fhttpd.git

vote + promote


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

diff --git a/STATUS b/STATUS
index 7c727e7f354..a22364b88c2 100644
--- a/STATUS
+++ b/STATUS
@@ -127,6 +127,25 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       +1: rjung, ylavic, jchampion
       jchampion: IMO, spell-checking STATUS is probably unnecessary.
 
+  *) mod_proxy_fcgi: read the whole FCGI response even when the content has
+     not been modified (HTTP 304) to avoid subsequent bogus reads and
+     confusing error messages logged.
+     trunk patch: http://svn.apache.org/r1752347
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: elukey, ylavic, sf
+
+  *) mod_proxy_fcgi: avoid loops serving proxied error documents.
+     trunk patch: http://svn.apache.org/r1753167
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: elukey, ylavic, sf
+
+  *) mod_http: Add the HEAD method to the lookup hash for completeness.
+      Trunk version of patch:
+         http://svn.apache.org/r1753257
+      Backport version for 2.4.x of patch:
+         Trunk version of patch works
+      +1: wrowe, ylavic, sf
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -173,13 +192,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1752333
      +1: jchampion
 
-  *) mod_proxy_fcgi: read the whole FCGI response even when the content has
-     not been modified (HTTP 304) to avoid subsequent bogus reads and
-     confusing error messages logged.
-     trunk patch: http://svn.apache.org/r1752347
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: elukey, ylavic
-
   *) autoconf: minor cleanup and removal of some dead code.
      trunk patch: http://svn.apache.org/r1753315
                   http://svn.apache.org/r1753316
@@ -190,18 +202,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: some conflicts with r1753315 in 2.4.x's configure.in.
      jchampion: added a 2.4.x backport patch.
 
-  *) mod_proxy_fcgi: avoid loops serving proxied error documents.
-     trunk patch: http://svn.apache.org/r1753167
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: elukey, ylavic
-
-  *) mod_http: Add the HEAD method to the lookup hash for completeness.
-      Trunk version of patch:
-         http://svn.apache.org/r1753257
-      Backport version for 2.4.x of patch:
-         Trunk version of patch works
-      +1: wrowe, ylavic
-
   *) mod_ssl: Fix quick renegotiation (OptRenegotiaton) with no intermediate
      in the client certificate chain.  PR 55786.
      trunk patch: http://svn.apache.org/r1756542
@@ -237,7 +237,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1756611
                   http://svn.apache.org/r1748155
      2.4.x patch: trunk works
-     +1: ylavic
+     +1: ylavic, sf
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED