Commit 36af304d authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Back down the default number of initial threads created with 

the threaded Unix MPM.  Tweak the sample configuration files to
reflect the default settings.


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

docs/conf/highperformance-std.conf

+2 −2
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ MaxSpareServers 10 


<IfModule threaded.c>

MaxClients       8

StartServers     1

StartServers     3

MinSpareThreads  5

MaxSpareThreads 10

ThreadsPerChild 20

ThreadsPerChild 25

</IfModule>



# Assume no memory leaks at all

docs/conf/httpd-std.conf

+2 −2
Original line number Diff line number Diff line
@@ -126,11 +126,11 @@ MaxRequestsPerChild 0 
# ThreadsPerChild ...... constant number of worker threads in each server process

# MaxRequestsPerChild .. maximum  number of requests a server process serves

<IfModule threaded.c>

StartServers         5

StartServers         3

MaxClients           8

MinSpareThreads      5

MaxSpareThreads     10

ThreadsPerChild     20

ThreadsPerChild     25

MaxRequestsPerChild  0

</IfModule>

server/mpm/threaded/mpm_default.h

+3 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
 * this free when the caretaker checks, it will spawn more.

 */

#ifndef DEFAULT_START_DAEMON

#define DEFAULT_START_DAEMON 5

#define DEFAULT_START_DAEMON 3

#endif



/* Maximum number of *free* server processes --- more than this, and
@@ -80,7 +80,7 @@ 
/* Minimum --- fewer than this, and more will be created */



#ifndef DEFAULT_MIN_FREE_DAEMON

#define DEFAULT_MIN_FREE_DAEMON 5

#define DEFAULT_MIN_FREE_DAEMON 3

#endif



/* Limit on the total --- clients will be locked out if more servers than
@@ -119,7 +119,7 @@ 
#define DEFAULT_THREADS_PER_CHILD 1

#endif

#ifndef DEFAULT_THREADS_PER_CHILD

#define DEFAULT_THREADS_PER_CHILD 50

#define DEFAULT_THREADS_PER_CHILD 25

#endif



/* File used for accept locking, when we use a file */