From: Graham Leggett <minfrin@apache.org>
Date: Wed, 1 Jan 2020 23:03:24 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.42~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3a1bfecac5bb5170fe0d41b6cbd760f54f1be41;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index e2a210ad903..e09b7bfeebf 100644
--- a/STATUS
+++ b/STATUS
@@ -132,6 +132,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: OCSP does not apply to proxy mode
+     trunk patch: http://svn.apache.org/r1865740
+     2.4.x patch: svn merge -c 1865740 ^/httpd/httpd/trunk .
+     +1: ylavic, jorton, minfrin
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -201,11 +206,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1861950 ^/httpd/httpd/trunk . 
      +1: minfrin
 
-  *) mod_ssl: OCSP does not apply to proxy mode
-     trunk patch: http://svn.apache.org/r1865740
-     2.4.x patch: svn merge -c 1865740 ^/httpd/httpd/trunk . 
-     +1: ylavic, jorton, 
-
   *) ap_check_pipeline: clarify/simplify !max_blank_lines logic, no functional change.
      trunk patch: http://svn.apache.org/r1765061
      2.4.x patch: svn merge -c 1765061 ^/httpd/httpd/trunk .