svn commit: r1031660 - in /httpd/httpd/branches/2.2.x/docs/manual/mod: mpm_common.html.en mpm_common.xml

[co...@apache.org]

Author: covener
Date: Fri Nov  5 16:43:17 2010
New Revision: 1031660

URL: http://svn.apache.org/viewvc?rev=1031660&view=rev
Log:
PR47782: Explain the delta between the compiled-in defaults for MaxRequestsPerChild and the common
default conf contents.  Not a backport because in trunk, they've been modified to line up.


Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.html.en?rev=1031660&r1=1031659&r2=1031660&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.html.en Fri Nov  5 16:43:17 2010
@@ -488,6 +488,13 @@ will handle during its life</td></tr>
       changes the behavior to limit the number of <em>connections</em> per
       child.</p>
     </div>
+    <div class="note"><h3>Default Configuration</h3>
+      <p>The default (compiled-in) value of this setting (10000) is used when
+      no <code class="directive">MaxRequestsPerChild</code> directive is present in the
+      configuration.  Many default configurations provided with the server include
+      "MaxRequestsPerChild 0" as part of the <em>default configuration</em>.</p>
+</div>
+
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml?rev=1031660&r1=1031659&r2=1031660&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml Fri Nov  5 16:43:17 2010
@@ -510,6 +510,13 @@ will handle during its life</description
       changes the behavior to limit the number of <em>connections</em> per
       child.</p>
     </note>
+    <note><title>Default Configuration</title>
+      <p>The default (compiled-in) value of this setting (10000) is used when
+      no <directive>MaxRequestsPerChild</directive> directive is present in the
+      configuration.  Many default configurations provided with the server include
+      "MaxRequestsPerChild 0" as part of the <em>default configuration</em>.</p>
+</note>
+
 </usage>
 </directivesynopsis>