From: Jeff Trawick <trawick@apache.org>
Date: Fri, 19 Sep 2003 20:02:04 +0000 (+0000)
Subject: Fix mod_info to use the real config file name, not the default
X-Git-Tag: pre_ajp_proxy~1148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9650c40c9fa66670c476d9bbb085ef00e90e7e48;p=apache

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:    G�nter Knauf, Jeff Trawick


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

diff --git a/CHANGES b/CHANGES
index 0cd6fad7af..12df1c9404 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Fix mod_info to use the real config file name, not the default
+     config file name.  [Aryeh Katz <aryeh@secured-services.com>]
+
   *) This fixes the cache code so that responses can be cached
      if they have an Expires header but no Etag or Last-Modified
      headers. PR 23130.
diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index f28c899932..9dffaf5b08 100644
--- 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) {