From: Bradley Nicholes <bnicholes@apache.org>
Date: Thu, 26 Aug 2004 18:04:19 +0000 (+0000)
Subject: Cool, no objections here.  One less backport
X-Git-Tag: STRIKER_2_0_51_RC1^2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f0fc7848897a030b809ec857fc8a378648ed9a1;p=thirdparty%2Fapache%2Fhttpd.git

Cool, no objections here.  One less backport


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

diff --git a/STATUS b/STATUS
index 68695168657..9415337b3b9 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/08/26 17:46:54 $]
+Last modified at [$Date: 2004/08/26 18:04:19 $]
 
 Release:
 
@@ -150,14 +150,6 @@ PATCHES TO BACKPORT FROM 2.1
          modules/mappers/mod_actions.c: r1.32, r1.34
        +1: nd
 
-    *) Allocate buffer memory from the temp_pool rather than the stack to
-       avoid over-running a fixed length stack while evaluating nested
-       include directives.
-         server/config.c: r1.180
-       +1: bnicholes, nd
-       nd: oops... This already went into the include recursion stopper
-           backport. Any objections? ;-)
-
     *) allow symlinks on directories to be processed by Include directives
        and stop possible recursion by a counter. PR 28492
          server/config.c: r1.175