From: Stefan Fritsch <sf@apache.org>
Date: Tue, 29 Mar 2011 22:01:27 +0000 (+0000)
Subject: Add PR reference and docs for -DDUMP_CONFIG
X-Git-Tag: 2.3.12~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fd44cea66b200f50fd67b32bc7fc906af5499ec;p=thirdparty%2Fapache%2Fhttpd.git

Add PR reference and docs for -DDUMP_CONFIG


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

diff --git a/CHANGES b/CHANGES
index 17256797ebb..59d65238a24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ Changes with Apache 2.3.12
      Partial fix for PR 50824. [Stefan Fritsch]
 
   *) mod_info: Dump config to stdout during startup if -DDUMP_CONFIG is
-     specified. [Stefan Fritsch]
+     specified. PR 31956. [Stefan Fritsch]
 
   *) Restore visibility of DEFAULT_PIDLOG to core and modules.  MPM 
      helper function ap_remove_pid() added.  [Jeff Trawick]
diff --git a/docs/manual/configuring.xml b/docs/manual/configuring.xml
index 13583a4b4c4..4b6c9ded2b7 100644
--- a/docs/manual/configuring.xml
+++ b/docs/manual/configuring.xml
@@ -104,6 +104,13 @@ Server.</p>
     without starting the server by using <code>apachectl
     configtest</code> or the <code>-t</code> command line
     option.</p>
+
+    <p>You can use <module>mod_info</module>'s <code>-DDUMP_CONFIG</code> to
+    dump the configuration with all included files and environment
+    variables resolved and all comments and non-matching
+    <directive module="core" type="section">IfDefine</directive> and
+    <directive module="core" type="section">IfModule</directive> sections
+    removed.</p>
   </section>
 
   <section id="modules">
diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml
index 6151a6c3a30..4bd6037bc98 100644
--- a/docs/manual/mod/mod_info.xml
+++ b/docs/manual/mod/mod_info.xml
@@ -115,6 +115,13 @@ configuration</description>
     </dl>
 </section>
 
+<section id="startup"><title>Dumping the configuration on startup</title>
+    <p>If the config define <code>-DDUMP_CONFIG</code> is set,
+    <module>mod_info</module> will dump the pre-parsed configuration to
+    <code>stdout</code> during server startup. This is roughly equivalent
+    to the <code>?config</code> query.</p>
+</section>
+
 <section id="limitations"><title>Known Limitations</title>
     <p><module>mod_info</module> provides its information by reading the
     parsed configuration, rather than reading the original configuration
diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml
index 35f6e9bd710..a28e2357678 100644
--- a/docs/manual/new_features_2_4.xml
+++ b/docs/manual/new_features_2_4.xml
@@ -173,13 +173,17 @@
       clients which require such headers. (This affects all modules which
       use these environment variables.)</dd>
 
-      <dt><module>mod_authz_core</module>Authorization Logic Containers</dt>
+      <dt><module>mod_authz_core</module> Authorization Logic Containers</dt>
 
       <dd>Advanced authorization logic may now be specified using the
           <directive module="mod_authz_core">Require</directive> directive
           and the related container directives, such as
           <directive module="mod_authz_core"
           type="section">RequireAll</directive>.</dd>
+
+      <dt><module>mod_info</module></dt>
+      <dd><module>mod_info</module> can now dump the pre-parsed configuration
+          to stdout during server startup.</dd>
     </dl>
   </section>