From: Stefan Eissing <icing@apache.org>
Date: Fri, 10 Sep 2021 09:47:41 +0000 (+0000)
Subject: update back port proposal [skip ci]
X-Git-Tag: candidate-2.4.49-rc1~1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a32cefb0369f7084462e740b66d74a78539c32dc;p=thirdparty%2Fapache%2Fhttpd.git

update back port proposal [skip ci]


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

diff --git a/STATUS b/STATUS
index 0bc70846d9c..fac792c7498 100644
--- a/STATUS
+++ b/STATUS
@@ -156,9 +156,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
   *) mod_http2: when a server is restarted gracefully, any idle h2 worker
      threads are shut down immediately.
+     Also, change OpenSSL API use for deprecations in OpenSLL 3.0.
      trunk patch: http://svn.apache.org/r1893214
                   http://svn.apache.org/r1893215
-     2.4.x patch: svn merge -c 1893214, 1893215 ^/httpd/httpd/trunk .
+                  http://svn.apache.org/1893220
+     2.4.x patch: svn merge -c 1893214,1893215,1893220 ^/httpd/httpd/trunk .
      +1: icing,
 
 PATCHES/ISSUES THAT ARE BEING WORKED