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 0cd6fad7af1fd1f17ce36ff840115dd99e9038fe..12df1c940404a0cf047f7e97bba8629b0b8a1692 100644 (file)
--- 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 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) {