You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2006/01/23 21:53:14 UTC
svn commit: r371662 - in /httpd/httpd/branches/2.0.x: ./ docs/manual/mod/
docs/manual/vhosts/
Author: colm
Date: Mon Jan 23 12:53:01 2006
New Revision: 371662
URL: http://svn.apache.org/viewcvs?rev=371662&view=rev
Log:
Merge r280384 from trunk:
Document the ReceiveBufferSize change done in r157583
Submitted by: Murray Nesbitt <mu...@cpan.org>
Submitted by: stas
Modified:
httpd/httpd/branches/2.0.x/CHANGES
httpd/httpd/branches/2.0.x/docs/manual/mod/beos.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_netware.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_winnt.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mpmt_os2.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/prefork.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/threadpool.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml
httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml
Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Mon Jan 23 12:53:01 2006
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.0.56
+ *) Document the ReceiveBufferSize change done in r157583 [Murray
+ Nesbitt <mu...@cpan.org>]
+
*) mod_deflate: Merge the Vary header, instead of Setting it. Fixes
applications that send the Vary Header themselves. PR 37559.
[Paul Querna]
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/beos.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/beos.xml?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/beos.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/beos.xml Mon Jan 23 12:53:01 2006
@@ -43,6 +43,8 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ListenBacklog</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ReceiveBufferSize</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>StartThreads</name>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml Mon Jan 23 12:53:01 2006
@@ -66,6 +66,8 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ListenBacklog</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ReceiveBufferSize</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>LockFile</name>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml Mon Jan 23 12:53:01 2006
@@ -634,6 +634,26 @@
</directivesynopsis>
<directivesynopsis>
+<name>ReceiveBufferSize</name>
+<description>TCP receive buffer size</description>
+<syntax>ReceiveBufferSize <var>bytes</var></syntax>
+<default>ReceiveBufferSize 0</default>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_netware</module><module>mpm_winnt</module>
+<module>mpmt_os2</module><module>perchild</module><module>prefork</module>
+<module>threadpool</module><module>worker</module></modulelist>
+
+<usage>
+ <p>The server will set the TCP receive buffer size to the number of
+ bytes specified.</p>
+
+ <p>If set to the value of <code>0</code>, the server will use the
+ OS default.</p>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
<name>SendBufferSize</name>
<description>TCP buffer size</description>
<syntax>SendBufferSize <var>bytes</var></syntax>
@@ -645,13 +665,13 @@
<module>threadpool</module><module>worker</module></modulelist>
<usage>
- <p>The server will set the TCP buffer size to the number of bytes
+ <p>The server will set the TCP send buffer size to the number of bytes
specified. Very useful to increase past standard OS defaults on
high speed high latency (<em>i.e.</em>, 100ms or so, such as
transcontinental fast pipes).</p>
<p>If set to the value of <code>0</code>, the server will use the
- OS deault.</p>
+ OS default.</p>
</usage>
</directivesynopsis>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_netware.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_netware.xml?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_netware.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_netware.xml Mon Jan 23 12:53:01 2006
@@ -73,6 +73,8 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ReceiveBufferSize</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>MaxSpareThreads</name>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_winnt.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_winnt.xml?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_winnt.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_winnt.xml Mon Jan 23 12:53:01 2006
@@ -50,6 +50,8 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ReceiveBufferSize</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ThreadLimit</name>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mpmt_os2.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mpmt_os2.xml?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mpmt_os2.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mpmt_os2.xml Mon Jan 23 12:53:01 2006
@@ -55,6 +55,8 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ListenBacklog</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ReceiveBufferSize</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml Mon Jan 23 12:53:01 2006
@@ -170,6 +170,8 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ReceiveBufferSize</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ServerLimit</name>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/prefork.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/prefork.xml?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/prefork.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/prefork.xml Mon Jan 23 12:53:01 2006
@@ -107,6 +107,8 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ReceiveBufferSize</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ServerLimit</name>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/threadpool.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/threadpool.xml?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/threadpool.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/threadpool.xml Mon Jan 23 12:53:01 2006
@@ -60,6 +60,8 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ListenBacklog</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ReceiveBufferSize</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>LockFile</name>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml Mon Jan 23 12:53:01 2006
@@ -167,6 +167,8 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ReceiveBufferSize</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ServerLimit</name>
Modified: httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml?rev=371662&r1=371661&r2=371662&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml Mon Jan 23 12:53:01 2006
@@ -191,6 +191,7 @@
<directive module="core">KeepAliveTimeout</directive>,
<directive module="core">KeepAlive</directive>,
<directive module="core">MaxKeepAliveRequests</directive>,
+ <directive module="core">ReceiveBufferSize</directive>,
or <directive module="core">SendBufferSize</directive>
directive then the respective value is inherited from the
main_server. (That is, inherited from whatever the final