]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Merged*1. [skip ci]
authorJoe Orton <jorton@apache.org>
Thu, 8 Jul 2021 07:05:04 +0000 (07:05 +0000)
committerJoe Orton <jorton@apache.org>
Thu, 8 Jul 2021 07:05:04 +0000 (07:05 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1891378 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 85b49d677ae32f40e903a336d6c9dd221f0112bf..af8bfaaceaf60fc195a8a35c9766d2fc80b75546 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -164,12 +164,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions5.patch
      +1: minfrin
 
-  *) Fix GCC 11 warnings from use of APR_RING macros.
-     trunk patch: http://svn.apache.org/r1889957
-     2.4.x patch: https://github.com/apache/httpd/commit/9740cd60fa56246952854b0113b4978188d16531.patch
-     CI output: https://travis-ci.com/github/apache/httpd/builds/231634323
-     +1: jorton, minfrin, jfclere
-
   *) Add hooks deliver_report and gather_reports to mod_dav.h. Allows other
      modules apart from versioning implementations to handle the REPORT method.
      trunk patch: http://svn.apache.org/r1879339