From: André Malo <nd@apache.org>
Date: Wed, 21 Apr 2004 21:30:26 +0000 (+0000)
Subject: propose a backport and fix description of another one
X-Git-Tag: 2.0.50~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=992fdd9daf1ea4a5f8b41349b0495b6f56977d49;p=thirdparty%2Fapache%2Fhttpd.git

propose a backport and fix description of another one


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

diff --git a/STATUS b/STATUS
index 3e431fd5cb9..9539322481c 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/04/20 20:27:02 $]
+Last modified at [$Date: 2004/04/21 21:30:26 $]
 
 Release:
 
@@ -72,8 +72,14 @@ PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]
 
+    *) allow symlinks on directories to be processed by Include directives
+       and stop possible recursion by a counter. PR 28492
+         server/config.c: r1.175
+       +1: nd
+
     *) detect Include directive recursion by counting the nesting level.
-         server/core.c: r1.1.275
+       PR 28370.
+         server/core.c: r1.275
        +1: nd
 
     *) mod_headers: don't segfault, when supplying an empty header value