Commit 19894893 authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files

Merge r280384 from trunk: 

Document the ReceiveBufferSize change done in r157583
Submitted by: Murray Nesbitt <murray@cpan.org>

Submitted by: stas


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@371662 13f79535-47bb-0310-9956-ffa450edef68
parent 18c8e44b

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.0.56









  *) Document the ReceiveBufferSize change done in r157583 [Murray









     Nesbitt <murray@cpan.org>]

















  *) mod_deflate: Merge the Vary header, instead of Setting it. Fixes









     applications that send the Vary Header themselves. PR 37559. 









     [Paul Querna]


































docs/manual/mod/beos.xml



+2
−0



























Changes for docs/manual/mod/beos.xml: 2 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -43,6 +43,8 @@ uses</a></seealso>







</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>


































docs/manual/mod/leader.xml



+2
−0



























Changes for docs/manual/mod/leader.xml: 2 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -66,6 +66,8 @@ MPM</description>







</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>


































docs/manual/mod/mpm_common.xml



+22
−2



























Changes for docs/manual/mod/mpm_common.xml: 22 added lines, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -633,6 +633,26 @@ the child processes</description>







Apache</a></seealso>









</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>










@@ -645,13 +665,13 @@ Apache</a></seealso>







<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>












































docs/manual/mod/mpm_netware.xml



+2
−0



























Changes for docs/manual/mod/mpm_netware.xml: 2 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -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>