From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 27 May 2015 15:36:52 +0000 (+0000)
Subject: Vote and promote
X-Git-Tag: 2.4.13~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7641f8b21c8477b6f1afa97a396f63a9f69253a;p=apache

Vote and promote

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

diff --git a/STATUS b/STATUS
index 254bed75fb..71a0d56b70 100644
--- a/STATUS
+++ b/STATUS
@@ -105,6 +105,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: fix small memory leak in ssl_init_server_certs when ECDH is used.
+     SSL_CTX_set_tmp_ecdh increases reference count, so we have to call
+     EC_KEY_free, otherwise eckey will not be freed.
+     trunk patch: http://svn.apache.org/r1666363
+     2.4.x patch: http://people.apache.org/~rjung/patches/httpd-2.4.x-free-eckey.patch
+     +1: rjung, ylavic, wrowe
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -225,13 +231,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works
      +1: jailletc36
 
-  *) mod_ssl: fix small memory leak in ssl_init_server_certs when ECDH is used.
-     SSL_CTX_set_tmp_ecdh increases reference count, so we have to call
-     EC_KEY_free, otherwise eckey will not be freed.
-     trunk patch: http://svn.apache.org/r1666363
-     2.4.x patch: http://people.apache.org/~rjung/patches/httpd-2.4.x-free-eckey.patch
-     +1: rjung, ylavic
-
   *) mod_ssl: add ALPN support by allowing other modules to register callbacks
               for negotiation of the application layer protocol.  PR 52210.
      trunk patch: http://svn.apache.org/r1332643