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

diff --git a/docs/conf/highperformance-std.conf b/docs/conf/highperformance-std.conf
index 5254062f2b5c69a59d18da81532af0da97ee79fa..aa707699df87a047a2071b0150912d4383cc0f76 100755 (executable)
--- a/docs/conf/highperformance-std.conf
+++ b/docs/conf/highperformance-std.conf
@@ -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

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index ac6ddc077f9a766651a1c9fda5fe461bd3ffad1c..561e7c4a14f02e32f6ad49ab3915bbceb4840350 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -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>
 

diff --git a/server/mpm/threaded/mpm_default.h b/server/mpm/threaded/mpm_default.h
index c9f2aa476ee734951d2cce5b181e60ba82f7afc8..84c1304bfa83f2a2142a649795517d4694e6747a 100644 (file)
--- a/server/mpm/threaded/mpm_default.h
+++ b/server/mpm/threaded/mpm_default.h
@@ -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 */