Vote hence promote.

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

diff --git a/STATUS b/STATUS
index aab2309e19cead6d436453ceccd92fb91ea3f962..2bb115a4a1bdcf306aeea2820c96328ae8aa8356 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -116,6 +116,36 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: jailletc36, jim, trawick
 
+   * mod_ssl: consistently output SSLCertificateChainFile deprecation warnings
+     trunk patch: https://svn.apache.org/r1676085
+     2.4.x patch: trunk patch works (modulo CHANGES)
+     +1: kbrand, trawick, ylavic
+
+  *) mod_proxy_scgi: ProxySCGIInternalRedirect with alternate response header
+     trunk patch: 1674510
+     2.4.x patch: trunk works (modulo CHANGES)
+       This also needs <compatibility> in the doc moved down like in 
+           http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_scgi.xml?r1=1674510&r2=1674530&diff_format=h
+       and the version edited :)
+     Pre-edited: http://people.apache.org/~trawick/r1674510-to-2.4.x.txt
+     +1: trawick, jim, ylavic
+
+   * mod_dav: Avoid some work that is unnecessary and often very time consuming.
+     This helps mitigate Subversion issue #4531:
+     http://subversion.tigris.org/issues/show_bug.cgi?id=4531
+     SVN has their own workaround for this going out that helps more but is a bit
+     of a hack.  This is as far as we can go without violating DAV in httpd.
+     trunk patch: http://svn.apache.org/r1677462
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: breser, trawick, ylavic
+
+  *) mod_authz_core: Allow "Require expr" to work when the expression is quoted,
+     as in an example in the doc.  PR 56235
+     trunk patch: http://svn.apache.org/r1585609
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: druggeri, breser, ylavic
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -251,26 +281,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic
 
-  *) mod_authz_core: Allow "Require expr" to work when the expression is quoted,
-     as in an example in the doc.  PR 56235
-     trunk patch: http://svn.apache.org/r1585609
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: druggeri, breser
-
-  *) mod_proxy_scgi: ProxySCGIInternalRedirect with alternate response header
-     trunk patch: 1674510
-     2.4.x patch: trunk works (modulo CHANGES)
-       This also needs <compatibility> in the doc moved down like in 
-           http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_scgi.xml?r1=1674510&r2=1674530&diff_format=h
-       and the version edited :)
-     Pre-edited: http://people.apache.org/~trawick/r1674510-to-2.4.x.txt
-     +1: trawick, jim
-
-   * mod_ssl: consistently output SSLCertificateChainFile deprecation warnings
-     trunk patch: https://svn.apache.org/r1676085
-     2.4.x patch: trunk patch works (modulo CHANGES)
-     +1: kbrand, trawick
-
   *) mod_ssl: Check for the Entropy Gathering Daemon (EGD) availability at
      configure time (RAND_egd), and complain if SSLRandomSeed requires using
      it otherwise.
@@ -280,15 +290,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic, trawick
 
-   * mod_dav: Avoid some work that is unnecessary and often very time consuming.
-     This helps mitigate Subversion issue #4531:
-     http://subversion.tigris.org/issues/show_bug.cgi?id=4531
-     SVN has their own workaround for this going out that helps more but is a bit
-     of a hack.  This is as far as we can go without violating DAV in httpd.
-     trunk patch: http://svn.apache.org/r1677462
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: breser, trawick
-
 
 OTHER PROPOSALS