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

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 8cbc54bd694..b11e8f19c70 100644
--- a/STATUS
+++ b/STATUS
@@ -126,6 +126,17 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) 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.
+     trunk patch: http://svn.apache.org/r1829250
+                  http://svn.apache.org/r1829263
+                  http://svn.apache.org/r1846111
+     2.4.x patch:
+       http://people.apache.org/~jorton/modssl_is_tls.diff
+       svn merge --record-only -c 1829250,1829263,1846111 ^/httpd/httpd/trunk .
+     +1: jorton, jim, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -194,17 +205,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: jailletc36, jim
      jailletc36: Test-case added in r1845094
 
-  *) 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.
-     trunk patch: http://svn.apache.org/r1829250
-                  http://svn.apache.org/r1829263
-                  http://svn.apache.org/r1846111
-     2.4.x patch:
-       http://people.apache.org/~jorton/modssl_is_tls.diff
-       svn merge --record-only -c 1829250,1829263,1846111 ^/httpd/httpd/trunk .
-     +1: jorton, jim
-
   *) mod_http2: change in cleanup strategy for slave connections.
      trunk patch: http://svn.apache.org/r1846125
      2.4.x patch: svn merge -c 1846125 ^/httpd/httpd/trunk .