]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
update after backport [skip ci]
authorStefan Eissing <icing@apache.org>
Fri, 3 Sep 2021 13:28:26 +0000 (13:28 +0000)
committerStefan Eissing <icing@apache.org>
Fri, 3 Sep 2021 13:28:26 +0000 (13:28 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1892870 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 8cf43d69a56dd382c71d27fdfc3c543e1ed63ef5..b9e9eeeea5e34664a155512bda00cc19540ebf08 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -155,21 +155,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_ssl: tighten the handling of ALPN for outgoing (proxy)
-     connections. If ALPN protocols are provided and sent to the
-     remote server, the received protocol selected is inspected
-     and checked for a match. Without match, the peer handshake
-     fails.
-     An exception is the proposal of "http/1.1" where it is
-     accepted if the remote server did not answer ALPN with
-     a selected protocol. This accomodates for hosts that do
-     not observe/support ALPN and speak http/1.x be default.
-     trunk patch: http://svn.apache.org/r1890693
-                  http://svn.apache.org/r1890696
-     2.4.x patch: https://github.com/apache/httpd/pull/204.diff
-           PR: https://github.com/apache/httpd/pull/204
-     +1: icing, minfrin, jorton
-
   *) mod_deflate: refrain from reading buckets of known length
      to determine their length. Reading transforms certain bucket
      types which prevents optimization further down the filter chain.