From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 3 Jul 2020 20:05:58 +0000 (+0000)
Subject: Remove backported entry [skip ci]
X-Git-Tag: 2.4.44~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3952922e4e3ae15c03aad8002f78f7538f90f4d3;p=thirdparty%2Fapache%2Fhttpd.git

Remove backported entry [skip ci]

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

diff --git a/STATUS b/STATUS
index 76d01db1457..62bf3250f72 100644
--- a/STATUS
+++ b/STATUS
@@ -135,35 +135,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) Easy patches: synch 2.4.x and trunk
-        - core: Re-introduce check for sufficient PCRE version.
-        - core: Fix doc string for QualifyRedirectURL
-        - mod_proxy: really return an error message on invalid "flusher" value.
-        - mod_http2: Remove extra and un-needed ""
-        - mod_ldap: fix a (unlikely) memory leak 
-        - ab: fix a typo
-        - suexec: Report error string after failure from setgid/initgroups or setuid
-        - mod_session_crypto: be less specific and don't echo passphrase
-        - mod_proxy_html: Fix proxy_html_conf.bufsz to have correct type, as
-                          it is used with ap_set_int_slot.
-        - mod_md: update duplicated APLOGNOs.
-     trunk patch:
-          http://svn.apache.org/r1612945
-          http://svn.apache.org/r1734835
-          http://svn.apache.org/r1738875
-          http://svn.apache.org/r1833416
-          http://svn.apache.org/r1842898
-          http://svn.apache.org/r1867257
-          http://svn.apache.org/r1876745
-          http://svn.apache.org/r1876807
-          http://svn.apache.org/r1876823
-          http://svn.apache.org/r1877642
-     2.4.x patch: svn merge --accept tc -c 1612945,1734835,1738875,1833416,1842898,1867257,1876745,1876807,1876823,1877642 ^/httpd/httpd/trunk . 
-     +1: jailletc36, jim, ylavic
-     jailletc36: 2 files conflict in this merge. I've added '--accept tc' to skip them.
-                 One is a doc file in r1734835 that has already been merged and the
-                 other one is 'next-number' in r1876823.
-
   *) mod_proxy_fcgi: Don't unset when condition is false. PR64365
      trunk patch:
         - http://svn.apache.org/r1877829