From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 15 Feb 2019 08:28:00 +0000 (+0000)
Subject: Fix case in directive name, so that quickreference.xsl can extract default value... 
X-Git-Tag: 2.4.39~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e56b9b9de17f43103a83baa73abb0de58661f9;p=thirdparty%2Fapache%2Fhttpd.git

Fix case in directive name, so that quickreference.xsl can extract default value correctly.
Add a note in ThreadsPerChild about the relationship with ThreadsLimit

r1838958, r1853617 and r1853618 in trunk

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

diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index 08e5a3e5b25..4dfcea9c808 100644
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -272,7 +272,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>
 
@@ -329,8 +329,8 @@ in *BSDs.</compatibility>
 <directivesynopsis>
 <name>ListenBackLog</name>
 <description>Maximum length of the queue of pending connections</description>
-<syntax>ListenBacklog <var>backlog</var></syntax>
-<default>ListenBacklog 511</default>
+<syntax>ListenBackLog <var>backlog</var></syntax>
+<default>ListenBackLog 511</default>
 <contextlist><context>server config</context></contextlist>
 <modulelist><module>event</module><module>worker</module>
 <module>prefork</module><module>mpm_winnt</module>
@@ -810,6 +810,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">ThreadLimit</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">ThreadLimit</directive>.</p>
 </usage>
 </directivesynopsis>