From: Graham Leggett <minfrin@apache.org>
Date: Sat, 21 Feb 2015 00:57:49 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.13~418
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc5e0cfa22872e99a47ab4969fc0f34e18a69727;p=apache

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 4978e614e9..152978556b 100644
--- a/STATUS
+++ b/STATUS
@@ -131,6 +131,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: jailletc36, mrumph, minfrin
 
+   * mod_proxy_connect: fix duplicated AH introduced by r1635645
+                        (and merged to 2.4.11 in r1642857).
+     trunk patch: http://svn.apache.org/r1656230
+     2.4.x patch: trunk works (modulo docs/log-message-tags)
+     +1: ylavic, jailletc36, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -259,12 +265,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES, docs/log-message-tags)
      +1: minfrin
 
-   * mod_proxy_connect: fix duplicated AH introduced by r1635645
-                        (and merged to 2.4.11 in r1642857).
-     trunk patch: http://svn.apache.org/r1656230
-     2.4.x patch: trunk works (modulo docs/log-message-tags)
-     +1: ylavic, jailletc36
-
    * mod_ssl: Add support for extracting subjectAltName entries of type
      rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
      variables. (also covers PR57207)