From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 24 Nov 2019 06:47:03 +0000 (+0000)
Subject: Remove backported item
X-Git-Tag: 2.4.42~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bf767f5c37777a1c2cb8c14d1c13c15a0307795;p=thirdparty%2Fapache%2Fhttpd.git

Remove backported item

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

diff --git a/STATUS b/STATUS
index ddad7d9889b..b5c7e64035f 100644
--- a/STATUS
+++ b/STATUS
@@ -132,27 +132,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: print r->uri during failure
-        - core: Call va_end before returning in the error case
-        - mod_cache_disk: fix a Coverity warning
-        - core: Provide TEST_CHAR macro in test_char.h
-        - tag some pools
-        - core: Fix a signed/unsigned comparison that can never match
-        - mod_session: leave a hint about session expiration at TRACE2
-        - mod_ssl: Fix a typo
-     trunk patch:
-        - http://svn.apache.org/r1787229
-        - http://svn.apache.org/r1842919
-        - http://svn.apache.org/r1842926
-        - http://svn.apache.org/r1856490
-        - http://svn.apache.org/r1862051
-        - http://svn.apache.org/r1864865
-        - http://svn.apache.org/r1865871
-        - http://svn.apache.org/r1867256
-     2.4.x patch: svn merge -c 1787229,1842919,1842926,1856490,1862051,1864865,1865871,1867256 ^/httpd/httpd/trunk . 
-     +1: jailletc36, jim, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]