From: Graham Leggett <minfrin@apache.org>
Date: Fri, 23 Nov 2018 14:56:08 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.38~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea73587c6fe24f735e8daed29088784146e5346e;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index f3eb44d1c9d..05696ac93e8 100644
--- a/STATUS
+++ b/STATUS
@@ -126,6 +126,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: Fixes PR 62880 where certificate loading fails bc SSL ERRs are
+              not cleared beforehand.
+     trunk patch: http://svn.apache.org/r1845768
+     2.4.x patch: svn merge -c 1845768 ^/httpd/httpd/trunk .
+     +1: icing, jim, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -194,12 +200,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: jailletc36, jim
      jailletc36: Test-case added in r1845094
 
-  *) mod_ssl: Fixes PR 62880 where certificate loading fails bc SSL ERRs are
-              not cleared beforehand.
-     trunk patch: http://svn.apache.org/r1845768
-     2.4.x patch: svn merge -c 1845768 ^/httpd/httpd/trunk .
-     +1: icing, jim
-
   *) mod_ssl: Fixes PR 62654 where "require ssl" did not work on HTTP/2
      connections, and PR 61519 where $HTTPS was incorrect for the
      "SSLEngine optional" case.