From: Eric Covener <covener@apache.org>
Date: Thu, 6 Jan 2011 01:31:43 +0000 (+0000)
Subject: Merge r1055701 from trunk:
X-Git-Tag: 2.2.18~194
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3ba702aeed03c774b09b39c9f65278af6e8df5d;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1055701 from trunk:

Add some weasel language, and a warning about Windows + TransmitFile, to the
SendBufferSize doc.




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

diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index e739893fe8d..0839df4640f 100644
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -683,6 +683,15 @@ Apache</a></seealso>
 
     <p>If set to the value of <code>0</code>, the server will use the
     OS default.</p>
+
+    <p>Further configuration of your operating system may be required to elicit
+    better performance on high speed, high latency connections.</p>
+
+    <note> <p> On some operating systems, changes in TCP behavior resulting
+    from a larger <directive>SendBufferSize</directive> may not be seen unless
+    <directive module="core">EnableSendfile</directive> is set to OFF.  This
+    interaction applies only to static files.</p> </note>
+
 </usage>
 </directivesynopsis>