From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 24 Aug 2018 20:49:43 +0000 (+0000)
Subject: Add a note in ThreadsPerChild about the relationship with ThreadsLimit.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2374
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae1582f9a7f3fca571a3c7d9d4241d43e751882f;p=thirdparty%2Fapache%2Fhttpd.git

Add a note in ThreadsPerChild about the relationship with ThreadsLimit.

+ add a missing link

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

diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index d1e09eeed51..6508ca7e494 100644
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -270,7 +270,7 @@ in *BSDs.</compatibility>
     <p>A <var>ratio</var> between the number of (online) CPU cores and the
     number of listeners' buckets can be used to make Apache HTTP Server create
     <code>num_cpu_cores / ratio</code> listening buckets, each containing its
-    own <directive>Listen</directive>-ing socket(s) on the same port(s), and
+    own <directive module="mpm_common">Listen</directive>-ing socket(s) on the same port(s), and
     then make each child handle a single bucket (with round-robin distribution
     of the buckets at children creation time).</p>
 
@@ -812,6 +812,12 @@ per child process</description>
     <p>The default value for <directive>ThreadsPerChild</directive> is
     <code>64</code> when used with <module>mpm_winnt</module> and
     <code>25</code> when used with the others.</p>
+    
+    <p>The value of <directive>ThreadsPerChild</directive> can not exceed the
+    value of <directive module="mpm_common">ThreadsLimit</directive>. If a
+    higher value is configured, it will be automatically reduced at start-up
+    and a warning will be logged. The relationship between these 2 directives
+    is explained in <directive module="mpm_common">ThreadsLimit</directive>.</p>
 </usage>
 </directivesynopsis>