]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
backported
authorEric Covener <covener@apache.org>
Thu, 5 Jan 2017 01:34:40 +0000 (01:34 +0000)
committerEric Covener <covener@apache.org>
Thu, 5 Jan 2017 01:34:40 +0000 (01:34 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1777402 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 1c7cfe1e65716ddcd363f09fbe4220ea638e6845..6e3ed5a8b859645d121b4b9a73c5e5826cc78163 100644 (file)
--- 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)