From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 5 Jan 2021 11:10:08 +0000 (+0000)
Subject: Backported [skip ci].
X-Git-Tag: 2.4.47~181
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=071375a5a176b02deaba28f42a1d8f9841d58dd2;p=thirdparty%2Fapache%2Fhttpd.git

Backported [skip ci].

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

diff --git a/STATUS b/STATUS
index f74a4cead2d..32c539c4f11 100644
--- a/STATUS
+++ b/STATUS
@@ -145,33 +145,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     Backport version for 2.4.x of patch:
      +1: jailletc36, giovanni, ylavic
 
-  *) mod_http2: thread safety with MPM prefork (mainly for ci..)
-     trunk patch: https://svn.apache.org/r1883704
-                  https://svn.apache.org/r1883707
-     2.4.x patch: svn merge -c 1883704,1883707 ^/httpd/httpd/trunk .
-     +1: ylavic, jorton, covener
-
-  *) core: fix c->client_ip for unix socket connections (e.g. proxy_fcgi)
-     trunk patch: https://svn.apache.org/r1883729
-     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-uds_client_ip.patch
-     +1: ylavic, jorton, covener
-
-  *) mod_case_filter_in: fix memory leak.
-     trunk patch: https://svn.apache.org/r1883730
-     2.4.x patch: svn merge -c 1883730 ^/httpd/httpd/trunk .
-     +1: ylavic, jorton, covener
-
-  *) mod_proxy: pconf vs pchild consistency, and correctness in ONE_PROCESS mode
-     trunk patch: https://svn.apache.org/r1883744
-     2.4.x patch: svn merge -c 1883744 ^/httpd/httpd/trunk .
-     +1: ylavic, jorton, covener
-
-  *) mod_auth_digest: fix crash with ONE_PROCESS (debug) mode shutdown
-     trunk patch: https://svn.apache.org/r1883810
-     2.4.x patch: svn merge -c 1883810 ^/httpd/httpd/trunk .
-     +1: ylavic, jorton, covener
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]