From: André Malo <nd@apache.org>
Date: Sat, 27 Mar 2004 19:07:29 +0000 (+0000)
Subject: propose backports
X-Git-Tag: 2.0.50~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a60fa5fb55ae157c7d248fa54fba72b5ddf89585;p=thirdparty%2Fapache%2Fhttpd.git

propose backports


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

diff --git a/STATUS b/STATUS
index a160cd8626a..30d3714da1c 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/03/27 00:18:03 $]
+Last modified at [$Date: 2004/03/27 19:07:29 $]
 
 Release:
 
@@ -72,6 +72,15 @@ 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! ]
 
+    *) mod_include: remove "recursive-include" check, it's no longer
+       necessary and forbids legal actions.
+          modules/filters/mod_include.c: r1.296
+       +1: nd
+
+    *) mod_alias: Emit a warning if an alias overlaps another
+          modules/mappers/mod_alias.c: r1.45, 1.46, 1.47, 1.48, 1.55
+      +1: nd
+
     *) mod_ssl: Disable the extra session caching in OpenSSL to prevent
        memory leak. PR: 26562.
            modules/ssl/ssl_engine_init.c:    r1.127