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

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 108fe67405b..4079d7c8206 100644
--- a/STATUS
+++ b/STATUS
@@ -132,6 +132,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) 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 .
+     +1: jailletc36, ylavic, minfrin
+     jailletc36: this is fine because if !max_blank_lines, we break at the first
+                 iteration, so we know that mode = AP_MODE_SPECULATIVE
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -201,13 +208,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1861950 ^/httpd/httpd/trunk . 
      +1: minfrin
 
-  *) 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 . 
-     +1: jailletc36, ylavic
-     jailletc36: this is fine because if !max_blank_lines, we break at the first
-                 iteration, so we know that mode = AP_MODE_SPECULATIVE
-
   *) mod_ssl: negotiate the TLS protocol version per name based vhost...
      trunk patch: http://svn.apache.org/r1868645
                   http://svn.apache.org/r1868743