From: Eric Covener <covener@apache.org>
Date: Fri, 5 Nov 2010 16:43:17 +0000 (+0000)
Subject: PR47782: Explain the delta between the compiled-in defaults for MaxRequestsPerChild... 
X-Git-Tag: 2.2.18~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39acdb6fe3954dc0f6f844a77312cb8ba933125b;p=thirdparty%2Fapache%2Fhttpd.git

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.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1031660 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 53c38bb045b..df552f67ca5 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -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>
diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index 4967d317117..7652516a047 100644
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -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>