From: Eric Covener <covener@apache.org>
Date: Thu, 5 Jan 2017 01:34:40 +0000 (+0000)
Subject: backported
X-Git-Tag: 2.2.32~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc36279c45f2d0c62103cd31f0c6c6cc03e3e2d3;p=thirdparty%2Fapache%2Fhttpd.git

backported


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

diff --git a/STATUS b/STATUS
index 1c7cfe1e657..6e3ed5a8b85 100644
--- a/STATUS
+++ b/STATUS
@@ -137,12 +137,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                  pair of hands and eyes on merging this to branches/2.2.x and
                  am happy to compare/verify against my working copy.
 
-  *) core: potential rejection of valid MaxMemFree and ThreadStackSize directives
-     trunk patch: https://svn.apache.org/r1542338
-     2.4.x patch: https://svn.apache.org/r1542549
-     2.2.x patch: trunk patch works
-     +1: mrumph, ylavic, covener
-
   *) Fix some compiler warnings
      trunk patch: https://svn.apache.org/r1125877
      2.4.x patch: https://svn.apache.org/r1125877 (from trunk)