From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 7 Nov 2019 16:48:29 +0000 (+0000)
Subject: Propose (and remove backported entry).
X-Git-Tag: 2.4.42~222
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36854c1955e1c140950c348c650708d87e403cb6;p=thirdparty%2Fapache%2Fhttpd.git

Propose (and remove backported entry).

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

diff --git a/STATUS b/STATUS
index 0860fc88922..3ab2cf014f6 100644
--- a/STATUS
+++ b/STATUS
@@ -131,13 +131,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   *) mod_deflate, mod_brotli: Honor "Accept-Encoding: foo;q=0" as per RFC 7231;
-                               which means 'foo' is "not acceptable".
-                               PR 58158
-      trunk patch: http://svn.apache.org/r1868313
-      2.4.x patch: svn merge -c 1868313 ^/httpd/httpd/trunk .
-      +1: jailletc36, jim, ylavic
-      jailletc36: tests added in r1868312.
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -266,6 +259,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      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
+                  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
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]