From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 9 Mar 2021 16:10:38 +0000 (+0000)
Subject: Backported [skip ci].
X-Git-Tag: 2.4.47~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4770f57dcb4234c91442f06decaa09bf44a58ef1;p=thirdparty%2Fapache%2Fhttpd.git

Backported [skip ci].

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

diff --git a/STATUS b/STATUS
index 21f03f4f1bb..f6ac8671fc9 100644
--- a/STATUS
+++ b/STATUS
@@ -172,13 +172,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-etag2.patch
     +1: minfrin, jim, ylavic
 
-  *) mod_http2: explicitely apr_thread_exit() at the end of slot_run(), and
-                fix workers synchronization on pchild cleanup.
-     trunk patch: http://svn.apache.org/r1883668
-                  http://svn.apache.org/r1886255
-     2.4.x patch: svn merge -c 1883668,1886255 ^/httpd/httpd/trunk .
-     +1: ylavic, icing, jorton
-
   *) mod_unique_id: Fix potential duplicated ID generation under heavy load.
      PR 65159
      trunk patch: http://svn.apache.org/r1887244
@@ -187,13 +180,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                   https://bz.apache.org/bugzilla/attachment.cgi?id=37749
      +1: jailletc36, ylavic, jorton
 
-  *) mod_proxy_http: Fix a potential random memory corruption issue
-     PR 64234
-     trunk patch: https://svn.apache.org/r1875353
-     2.4.x patch: https://bz.apache.org/bugzilla/show_bug.cgi?id=64234#c2
-     +1: ylavic, jorton, jfclere
-     jailletc36: if applied on 2.4.x, a CHANGES entry should be added
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]