From: Joe Orton <jorton@apache.org>
Date: Fri, 7 Feb 2020 16:57:13 +0000 (+0000)
Subject: Merged.  [skip ci]
X-Git-Tag: 2.4.42~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65f08adf6da2c46a1703ed21445ffa44f6001171;p=thirdparty%2Fapache%2Fhttpd.git

Merged.  [skip ci]


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

diff --git a/STATUS b/STATUS
index 8bdafc0d244..53f2aef9ddd 100644
--- a/STATUS
+++ b/STATUS
@@ -132,12 +132,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_cgi, mod_cgid: Fix a memory leak when discarding script output
-     after various error conditions.  PR 64096
-     trunk patch: https://svn.apache.org/r1867970
-     2.4.x patch: https://github.com/apache/httpd/commit/ed258a2133bc48ee90b027eead13e2d28d03c66a.patch
-     Test results: https://travis-ci.org/apache/httpd/builds/642414361
-     +1: jorton, covener, rpluem
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]