From: Jeff Trawick <trawick@apache.org>
Date: Fri, 19 Sep 2003 20:06:31 +0000 (+0000)
Subject: yet another proposed merge
X-Git-Tag: 2.0.48~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f16461c7e452d8c84b36b40a8e3a3fed28d8b372;p=thirdparty%2Fapache%2Fhttpd.git

yet another proposed merge


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

diff --git a/STATUS b/STATUS
index e1d30ecf486..bef5e70112d 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/09/18 15:16:17 $]
+Last modified at [$Date: 2003/09/19 20:06:31 $]
 
 Release:
 
@@ -335,6 +335,11 @@ PATCHES TO PORT FROM 2.1
         modules/filters/mod_ext_filter.c r1.5
       +1: trawick
 
+    * Fix mod_info to use the real config file name, not the default
+      config file name.
+        modules/generators/mod_info.c r1.151
+      +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,