]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Use jorton's more comprehensive patch set, vote.
authorGraham Leggett <minfrin@apache.org>
Fri, 10 Dec 2021 16:03:58 +0000 (16:03 +0000)
committerGraham Leggett <minfrin@apache.org>
Fri, 10 Dec 2021 16:03:58 +0000 (16:03 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1895785 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 5ce1d5190311d8f6c7af859c12ed40a402800045..f03da28050170706ff62e89aa327ed16868e516d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -201,12 +201,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      backport PR: https://github.com/apache/httpd/pull/281
      +1: icing, minfrin
 
-  *) mod_ssl: Fix build failure due to ERR_GET_FUNC removal in OpenSSL v3.
-     trunk patch: http://svn.apache.org/r1891138
-                  http://svn.apache.org/r1894716
-     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/mod_ssl-openssl3-fix.patch
-     +1: minfrin
-
   *) mod_ssl: Updates to support OpenSSL 3.x
      trunk patch: https://svn.apache.org/r1519264
                   https://svn.apache.org/r1737657
@@ -223,7 +217,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      backport PR: https://github.com/apache/httpd/pull/258
      2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/258.patch
                   or https://people.apache.org/~jorton/mod_ssl-openssl3.patch
-     +1: jorton,
+     +1: jorton, minfrin
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]