backport this from Apache 2.1-dev:

 Fix mod_info to use the real config file name, not the default
 config file name.

Submitted by:  Aryeh Katz <aryeh@secured-services.com>
Reviewed by:   trawick, striker, nd

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

diff --git a/CHANGES b/CHANGES
index d2e2a17dadbea2443f2a7234c44c48b9ca0911a3..7dd598a2ab4632cf4c193c1db0fb058a7c1afcd7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) Fix mod_info to use the real config file name, not the default
+     config file name.  [Aryeh Katz <aryeh@secured-services.com>]
+
   *) Set the scoreboard state to indicate logging prior to running 
      logging hooks so that server-status will show 'L' for hung loggers
      instead of 'W'.  [Jeff Trawick]

diff --git a/STATUS b/STATUS
index bd52cdaf9a54b246f02aeece6cef55f876a65740..7c4ba41a01957c5ef6aac1b60bea14e655d43e53 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/11/01 16:22:15 $]
+Last modified at [$Date: 2003/11/01 16:29:56 $]
 
 Release:
 
@@ -256,11 +256,6 @@ PATCHES TO BACKPORT FROM 2.1
         modules/filters/mod_ext_filter.c r1.5
       +1: trawick, nd
 
-    * 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, striker, nd
-
     * When UseCanonicalName is set to OFF, allow ap_get_server_port to 
       check r->connection->local_addr->port before defaulting to 
       server->port or ap_default_port()

diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index f28c899932e70238c12dbff0e1ac2dd5fea90f94..9dffaf5b08791da03e10a86d092cde8b2a59192a 100644 (file)
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -405,7 +405,7 @@ static int display_info(request_rec *r)
             ap_rprintf(r, "<dt><strong>Server Root:</strong> "
                         "<tt>%s</tt></dt>\n", ap_server_root);
             ap_rprintf(r, "<dt><strong>Config File:</strong> "
-                      "<tt>%s</tt></dt>\n", SERVER_CONFIG_FILE);
+                      "<tt>%s</tt></dt>\n", ap_conftree->filename);
             ap_rputs("</dl><hr />", r);
         }
         for (modp = ap_top_module; modp; modp = modp->next) {