Commit abd41582 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Rename MaxClients to MaxRequestWorkers which describes more accurately what 

it does.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137744 13f79535-47bb-0310-9956-ffa450edef68
parent 67d955c1

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.3.13



  *) prefork, worker, event: Rename MaxClients to MaxRequestWorkers which

     describes more accurately what it does. [Stefan Fritsch]



  *) rotatelogs: Add -p argument to specify custom program to invoke

     after a log rotation.  PR 51285. [<sveniu ifi.uio.no>, Joe Orton]

docs/conf/extra/httpd-mpm.conf.in

+6 −6
Original line number Diff line number Diff line
@@ -30,48 +30,48 @@ 
# StartServers: number of server processes to start

# MinSpareServers: minimum number of server processes which are kept spare

# MaxSpareServers: maximum number of server processes which are kept spare

# MaxClients: maximum number of server processes allowed to start

# MaxRequestWorkers: maximum number of server processes allowed to start

# MaxConnectionsPerChild: maximum number of connections a server process serves

#                         before terminating

<IfModule mpm_prefork_module>

    StartServers             5

    MinSpareServers          5

    MaxSpareServers         10

    MaxClients             150

    MaxRequestWorkers      150

    MaxConnectionsPerChild   0

</IfModule>



# worker MPM

# StartServers: initial number of server processes to start

# MaxClients: maximum number of simultaneous client connections

# MinSpareThreads: minimum number of worker threads which are kept spare

# MaxSpareThreads: maximum number of worker threads which are kept spare

# ThreadsPerChild: constant number of worker threads in each server process

# MaxRequestWorkers: maximum number of worker threads

# MaxConnectionsPerChild: maximum number of connections a server process serves

#                         before terminating

<IfModule mpm_worker_module>

    StartServers             2

    MaxClients             150

    MinSpareThreads         25

    MaxSpareThreads         75 

    ThreadsPerChild         25

    MaxRequestWorkers      150

    MaxConnectionsPerChild   0

</IfModule>



# event MPM

# StartServers: initial number of server processes to start

# MaxClients: maximum number of simultaneous client connections

# MinSpareThreads: minimum number of worker threads which are kept spare

# MaxSpareThreads: maximum number of worker threads which are kept spare

# ThreadsPerChild: constant number of worker threads in each server process

# MaxRequestWorkers: maximum number of worker threads

# MaxConnectionsPerChild: maximum number of connections a server process serves

#                         before terminating

<IfModule mpm_event_module>

    StartServers             2

    MaxClients             150

    MinSpareThreads         25

    MaxSpareThreads         75

    ThreadsPerChild         25

    MaxRequestWorkers      150

    MaxConnectionsPerChild   0

</IfModule>

docs/manual/misc/perf-tuning.xml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
    that users consider "fast enough". This causes users to hit

    stop and reload, further increasing the load. You can, and

    should, control the <directive module="mpm_common"

    >MaxClients</directive> setting so that your server

    >MaxRequestWorkers</directive> setting so that your server

    does not spawn so many children it starts swapping. This procedure

    for doing this is simple: determine the size of your average Apache

    process, by looking at your process list via a tool such as

docs/manual/misc/security_tips.xml

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
      require reconfiguration of your kernel.</li>



      <li>Tune the <directive

      module="mpm_common">MaxClients</directive> directive to allow

      module="mpm_common">MaxRequestWorkers</directive> directive to allow

      the server to handle the maximum number of simultaneous

      connections without running out of resources.  See also the <a

      href="perf-tuning.html">performance tuning

docs/manual/mod/event.xml

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ of consuming threads only for connections with active processing</description> 
</directivesynopsis>

<directivesynopsis location="mpm_common"><name>SendBufferSize</name>

</directivesynopsis>

<directivesynopsis location="mpm_common"><name>MaxClients</name>

<directivesynopsis location="mpm_common"><name>MaxRequestWorkers</name>

</directivesynopsis>

<directivesynopsis location="mpm_common"><name>MaxMemFree</name>

</directivesynopsis>