From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 27 Jan 2010 18:27:19 +0000 (+0000)
Subject: Move core flags into core.xml directives
X-Git-Tag: 2.3.6~543
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c33969baf98612903c1746dca09cc6d6f949ff2;p=thirdparty%2Fapache%2Fhttpd.git

Move core flags into core.xml directives

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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 17573dee423..3ea3a187b69 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1092,6 +1092,40 @@ in case of an error</description>
 <seealso><a href="../logs.html">Apache Log Files</a></seealso>
 </directivesynopsis>
 
+<directivesynopsis>
+
+<directivesynopsis>
+<name>ExtendedStatus</name>
+<description>Keep track of extended status information for each 
+request</description>
+<syntax>ExtendedStatus On|Off</syntax>
+<default>ExtendedStatus Off[*]</default>
+<contextlist><context>server config</context></contextlist>
+
+<usage>
+    <p>This option tracks additional data per worker about the
+    currently executing request, and a utilization summary; you 
+    can see these variables during runtime by configuring 
+    <module>mod_status</module>.  Note that other modules may
+    rely on this scoreboard.</p>
+
+    <p>This setting applies to the entire server, and cannot be
+    enabled or disabled on a virtualhost-by-virtualhost basis.
+    The collection of extended status information can slow down
+    the server.  Also note that this setting cannot be changed
+    during a graceful restart.</p>
+</usage>
+
+<note>
+    <p>Note that loading <module>mod_status</module> will change 
+    the default behavior to ExtendedStatus On, while other
+    third party modules may do the same.  Such modules rely on
+    collecting detailed information about the state of all workers.
+    The default is changed by <module>mod_status</module> beginning
+    with version 2.3.6; the previous default was always Off.
+</note>
+</directivesynopsis>
+
 <directivesynopsis>
 <name>FileETag</name>
 <description>File attributes used to create the ETag
@@ -2882,6 +2916,45 @@ later</compatibility>
 </usage>
 </directivesynopsis>
 
+<directivesynopsis>
+<name>SeeRequestTail</name>
+<description>Determine if mod_status displays the first 63 characters
+of a request or the last 63, assuming the request itself is greater than
+63 chars.</description>
+<syntax>SeeRequestTail On|Off</syntax>
+<default>SeeRequestTail Off</default>
+<contextlist><context>server config</context></contextlist>
+<compatibility>Available in Apache 2.2.7 and later.</compatibility>
+
+<usage>
+    <p>mod_status with <code>ExtendedStatus On</code>
+    displays the actual request being handled. 
+    For historical purposes, only 63 characters of the request
+    are actually stored for display purposes. This directive
+    controls whether the 1st 63 characters are stored (the previous
+    behavior and the default) or if the last 63 characters are. This
+    is only applicable, of course, if the length of the request is
+    64 characters or greater.</p>
+
+    <p>If Apache is handling <code
+    >GET&nbsp;/disk1/storage/apache/htdocs/images/imagestore1/food/apples.jpg&nbsp;HTTP/1.1</code
+    > mod_status displays as follows:
+    </p>
+
+    <table border="1">
+      <tr>
+        <th>Off (default)</th>
+        <td>GET&nbsp;/disk1/storage/apache/htdocs/images/imagestore1/food/apples</td>
+      </tr>
+      <tr>
+        <th>On</th>
+        <td>orage/apache/htdocs/images/imagestore1/food/apples.jpg&nbsp;HTTP/1.1</td>
+      </tr>
+    </table>
+
+</usage>
+</directivesynopsis>
+
 <directivesynopsis>
 <name>ServerAdmin</name>
 <description>Email address that the server includes in error
diff --git a/docs/manual/mod/mod_status.xml b/docs/manual/mod/mod_status.xml
index 7d8c577ba51..497e454be4c 100644
--- a/docs/manual/mod/mod_status.xml
+++ b/docs/manual/mod/mod_status.xml
@@ -65,8 +65,10 @@ performance</description>
     </ul>
 
     <p>The lines marked "(*)" are only available if 
-    <directive module="mod_status">ExtendedStatus</directive> 
-    is <code>On</code>.</p>
+    <directive module="core">ExtendedStatus</directive> 
+    is <code>On</code>.  In version 2.3.6, loading mod_status will
+    toggle <directive module="core">ExtendedStatus</directive> On
+    by default.</p>
 </summary>
 
 <section id="enable">
@@ -121,63 +123,5 @@ performance</description>
 
 </section>
 
-<directivesynopsis>
-
-<name>ExtendedStatus</name>
-<description>Keep track of extended status information for each 
-request</description>
-<syntax>ExtendedStatus On|Off</syntax>
-<default>ExtendedStatus Off</default>
-<contextlist><context>server config</context></contextlist>
-
-<usage>
-    <p>This setting applies to the entire server, and cannot be
-    enabled or disabled on a virtualhost-by-virtualhost basis.
-    The collection of extended status information can slow down
-    the server.</p>
-</usage>
-
-</directivesynopsis>
-<directivesynopsis>
-
-<name>SeeRequestTail</name>
-<description>Determine if mod_status displays the first 63 characters
-of a request or the last 63, assuming the request itself is greater than
-63 chars.</description>
-<syntax>SeeRequestTail On|Off</syntax>
-<default>SeeRequestTail Off</default>
-<contextlist><context>server config</context></contextlist>
-<compatibility>Available in Apache 2.2.7 and later.</compatibility>
-
-<usage>
-    <p>mod_status with <code>ExtendedStatus On</code>
-    displays the actual request being handled. 
-    For historical purposes, only 63 characters of the request
-    are actually stored for display purposes. This directive
-    controls whether the 1st 63 characters are stored (the previous
-    behavior and the default) or if the last 63 characters are. This
-    is only applicable, of course, if the length of the request is
-    64 characters or greater.</p>
-
-    <p>If Apache is handling <code
-    >GET&nbsp;/disk1/storage/apache/htdocs/images/imagestore1/food/apples.jpg&nbsp;HTTP/1.1</code
-    > mod_status displays as follows:
-    </p>
-
-    <table border="1">
-      <tr>
-        <th>Off (default)</th>
-        <td>GET&nbsp;/disk1/storage/apache/htdocs/images/imagestore1/food/apples</td>
-      </tr>
-      <tr>
-        <th>On</th>
-        <td>orage/apache/htdocs/images/imagestore1/food/apples.jpg&nbsp;HTTP/1.1</td>
-      </tr>
-    </table>
-
-</usage>
-
-</directivesynopsis>
-
 </modulesynopsis>