From: Graham Leggett <minfrin@apache.org>
Date: Thu, 22 Jan 2015 17:25:13 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.12~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b85aa4b3b28edb524e2b090e2249e9d91beeeaf;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index c9677529904..09c96489703 100644
--- a/STATUS
+++ b/STATUS
@@ -118,6 +118,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunks works
      +1: rjung, ylavic, wrowe
 
+   * mod_ssl: Fix renegotiation failures redirected to an ErrorDocument.
+              (segfault flaw) PR 57334.
+     trunk patch: http://svn.apache.org/r1644498
+     2.4.x patch: trunk works (module CHANGES)
+     +1: ylavic, wrowe, minfrin
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -173,12 +180,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (module CHANGES)
      +1: ylavic
 
-   * mod_ssl: Fix renegotiation failures redirected to an ErrorDocument.
-              (segfault flaw) PR 57334.
-     trunk patch: http://svn.apache.org/r1644498
-     2.4.x patch: trunk works (module CHANGES)
-     +1: ylavic, wrowe
-
    * core: Add ap_errorlog_provider to make ErrorLog logging modular. This
            backport keeps syslog logging as part of httpd core and only adds
            API to allow other modules to be used for error logging.