From: Joe Orton <jorton@apache.org>
Date: Fri, 5 Jul 2019 11:50:50 +0000 (+0000)
Subject: Two done.
X-Git-Tag: 2.4.40~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac58a47ddf9c28b820e3a13a78f6b9305a595b4a;p=thirdparty%2Fapache%2Fhttpd.git

Two done.

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

diff --git a/STATUS b/STATUS
index bebd61b3915..cb29145bca9 100644
--- a/STATUS
+++ b/STATUS
@@ -127,18 +127,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) Kill export of "nul" symbol.
-     trunk: http://svn.apache.org/r1861690
-     2.4.x: svn merge -c 1861690 ^/httpd/httpd/trunk .
-     +1: jorton, jfclere, icing
-
-  *) Fix mod_mime_magic potential content-type corruption (seen in the wild),
-     and update match for WAV files to work properly.
-     trunk: http://svn.apache.org/r1491700
-            http://svn.apache.org/r1862200
-     2.4.x: svn merge -c 1491700,1862200 ^/httpd/httpd/trunk . works [needs CHANGES]
-     +1: jorton, jim, icing
-
   *) easy patches to synch 2.4.x and trunk:
         - core: extend description of r->hostname
         - mod_proxy_http: Avoid memory allocation before making sure that this handler can handle the URL