From: André Malo <nd@apache.org>
Date: Thu, 7 Aug 2003 16:41:10 +0000 (+0000)
Subject: propose another backport
X-Git-Tag: 2.0.48~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35a435a11e0eb633aa3a74f1ffd0d51725836e82;p=thirdparty%2Fapache%2Fhttpd.git

propose another backport


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

diff --git a/STATUS b/STATUS
index 15c7af19eb9..f012fe86e27 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/08/07 14:17:28 $]
+Last modified at [$Date: 2003/08/07 16:41:10 $]
 
 Release:
 
@@ -303,6 +303,12 @@ PATCHES TO PORT FROM 2.1
         include/util_ebcdic.h: r1.15
       +1: nd
 
+    * Avoid an infinite recursion, which occured if the name of an included
+      config file or directory contained a wildcard character. PR 22194.
+      (2.0 + 1.3)
+        server/config.c: r1.165
+      +1: nd
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,