merge r1374569 from trunk:

add links to AcceptFilter and Windows platform documentation

add some notes on key configuration issues

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

diff --git a/docs/manual/mod/mpm_winnt.xml b/docs/manual/mod/mpm_winnt.xml
index 2b5fa4af0d5e0396744491b117b2899d4bbd103f..7960d1cbc8e6d3a5276356a94258d1de3ffdfc0d 100644 (file)
--- a/docs/manual/mod/mpm_winnt.xml
+++ b/docs/manual/mod/mpm_winnt.xml
@@ -34,8 +34,33 @@ NT.</description>
     Windows NT operating systems. It uses a single control process
     which launches a single child process which in turn creates
     threads to handle requests</p>
+
+    <p>Capacity is configured using the 
+    <directive module="mpm_common">ThreadsPerChild</directive> directive,
+    which sets the maximum number of concurrent client connections.</p>
+
+    <p>By default, this MPM uses advanced Windows APIs for accepting
+    new client connections.  In some configurations, third-party products
+    may interfere with this implementation, with the following messages
+    written to the web server log:</p>
+
+    <example>
+        Child: Encountered too many AcceptEx faults accepting client connections.<br />
+        winnt_mpm: falling back to 'AcceptFilter none'.
+    </example>
+
+    <p>The MPM falls back to a safer implementation, but some client requests
+    were not processed correctly.  In order to avoid this error, use
+    <directive module="core">AcceptFilter</directive> with accept filter 
+    <code>none</code>.  <em>In Apache httpd 2.0 and 2.2,
+    <directive>Win32DisableAcceptEx</directive> was used for this purpose.</em></p>
+
 </summary>
 
+<seealso><a href="../platform/windows.html">Using Apache HTTP Server on Microsoft Windows</a></seealso>
+
+<directivesynopsis location="core"><name>AcceptFilter</name>
+</directivesynopsis>
 <directivesynopsis location="mpm_common"><name>CoreDumpDirectory</name>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>PidFile</name>