From: Jim Jagielski <jim@apache.org>
Date: Tue, 11 Feb 2020 13:14:12 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.42~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75d8b9761cd057d96915561871950b0964c1f892;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 6280f4126d5..061debfb283 100644
--- a/STATUS
+++ b/STATUS
@@ -150,6 +150,19 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          (MMN conflicts)
      +1: covener, minfrin, jorton
 
+  *) mod_ssl: negotiate the TLS protocol version per name based vhost...
+     trunk patch: http://svn.apache.org/r1868645
+                  http://svn.apache.org/r1868743
+                  http://svn.apache.org/r1868929
+                  http://svn.apache.org/r1868934
+                  http://svn.apache.org/r1869077
+     2.4.x patch: svn merge -c 1868645,1868743,1868929,1868934,1869077 ^/httpd/httpd/trunk .
+                  (merge works modulo CHANGES, below patch for all in one review)
+                  http://people.apache.org/~ylavic/patches/httpd-2.4.x-SSLProtocol_per_vhost.patch
+     +1: ylavic, minfrin, jim
+     minfrin: Tiny detail - docs refer to version 2.5.1
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -196,18 +209,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1861950 ^/httpd/httpd/trunk . 
      +1: minfrin, jim
 
-  *) mod_ssl: negotiate the TLS protocol version per name based vhost...
-     trunk patch: http://svn.apache.org/r1868645
-                  http://svn.apache.org/r1868743
-                  http://svn.apache.org/r1868929
-                  http://svn.apache.org/r1868934
-                  http://svn.apache.org/r1869077
-     2.4.x patch: svn merge -c 1868645,1868743,1868929,1868934,1869077 ^/httpd/httpd/trunk .
-                  (merge works modulo CHANGES, below patch for all in one review)
-                  http://people.apache.org/~ylavic/patches/httpd-2.4.x-SSLProtocol_per_vhost.patch
-     +1: ylavic, minfrin, jim
-     minfrin: Tiny detail - docs refer to version 2.5.1
-
   *) Add a config layout for OpenWRT
      trunk patch: http://svn.apache.org/r1872036
                   http://svn.apache.org/r1872093