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

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 749916e2075..73bf61e3c8a 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: Fix the error code returned in an error path of 'ssl_io_filter_handshake()'
+              This messes-up error handling performed in 'ssl_io_filter_error()'
+     trunk patch: http://svn.apache.org/r1645529
+                  http://svn.apache.org/r1839442
+     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-mod_proxy-handshake-bad_gateway.patch
+     +1: ylavic, jim, minfrin
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -155,13 +161,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      elukey: PR 62025 seems another use case that gets fixed using this patch
              (still need to get feedback from the reporter but on my local env it solves the problem).
 
-  *) mod_ssl: Fix the error code returned in an error path of 'ssl_io_filter_handshake()'
-              This messes-up error handling performed in 'ssl_io_filter_error()'
-     trunk patch: http://svn.apache.org/r1645529
-                  http://svn.apache.org/r1839442
-     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-mod_proxy-handshake-bad_gateway.patch
-     +1: ylavic, jim
-
    *) Add in mod_socache_redis from trunk
       trunk: http://svn.apache.org/r1768070
              http://svn.apache.org/r1768120