From: Rainer Jung <rjung@apache.org>
Date: Sun, 10 May 2015 20:56:26 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.13~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5b3177cdeed14debc9dd73efee0675d8da20092;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.


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

diff --git a/STATUS b/STATUS
index af6d1bc509b..35e1759ce42 100644
--- a/STATUS
+++ b/STATUS
@@ -105,6 +105,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: Check for the Entropy Gathering Daemon (EGD) availability at
+     configure time (RAND_egd), and complain if SSLRandomSeed requires using
+     it otherwise.
+     trunk patch: http://svn.apache.org/r1674542
+                  http://svn.apache.org/r1675410
+                  http://svn.apache.org/r1676842
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, trawick, rjung
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -243,15 +252,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic
 
-  *) mod_ssl: Check for the Entropy Gathering Daemon (EGD) availability at
-     configure time (RAND_egd), and complain if SSLRandomSeed requires using
-     it otherwise.
-     trunk patch: http://svn.apache.org/r1674542
-                  http://svn.apache.org/r1675410
-                  http://svn.apache.org/r1676842
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, trawick
-
   *) http: Don't remove the Content-Length of zero from a HEAD response if
      it comes from an origin server, module or script. Allow the previous
      behaviour (for legacy/buggy modules only, not origin) by also backporting