Merge r1306426, r1306841 from trunk:

Update worker mpm defaults to match documentation and built-in defaults.
As per https://issues.apache.org/bugzilla/show_bug.cgi?id=52102

Updated event mpm configuration to match the defaults in documentation and header definitions.
Updated prefork defaults to better match documentation and header definition.
Submitted by: humbedooh
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364600 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 785df26142ea5df68b22b3b211185ab322bbc045..28c4794e694a1b5602fc043f7f8f4dd789b4b742 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -133,15 +133,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: rjung, humbedooh, jim
      rjung: sf: you applied it to trunk, care to vote?
 
-   * core config: Update worker and event mpm defaults to match documentation
-     and built-in defaults. PR 52102.
-     Changed values for MaxRequestWorkers, StartServers, MinSpareThreads
-     and MaxSpareThreads in httpd-mpm.conf.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1306426 and
-                  http://svn.apache.org/viewvc?view=revision&revision=1306841
-     2.4.x patch: trunk patch works
-     +1: rjung, humbedooh, jim
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/docs/conf/extra/httpd-mpm.conf.in b/docs/conf/extra/httpd-mpm.conf.in
index b64da4ef903d468fc6236da924bc86dfbfae3074..bf29fafe003912f0db1f3921136cf8884a830349 100644 (file)
--- a/docs/conf/extra/httpd-mpm.conf.in
+++ b/docs/conf/extra/httpd-mpm.conf.in
@@ -29,7 +29,7 @@
     StartServers             5
     MinSpareServers          5
     MaxSpareServers         10
-    MaxRequestWorkers      150
+    MaxRequestWorkers      250
     MaxConnectionsPerChild   0
 </IfModule>
 
@@ -42,11 +42,11 @@
 # MaxConnectionsPerChild: maximum number of connections a server process serves
 #                         before terminating
 <IfModule mpm_worker_module>
-    StartServers             2
-    MinSpareThreads         25
-    MaxSpareThreads         75 
+    StartServers             3
+    MinSpareThreads         75
+    MaxSpareThreads        250 
     ThreadsPerChild         25
-    MaxRequestWorkers      150
+    MaxRequestWorkers      400
     MaxConnectionsPerChild   0
 </IfModule>
 
@@ -59,11 +59,11 @@
 # MaxConnectionsPerChild: maximum number of connections a server process serves
 #                         before terminating
 <IfModule mpm_event_module>
-    StartServers             2
-    MinSpareThreads         25
-    MaxSpareThreads         75
+    StartServers             3
+    MinSpareThreads         75
+    MaxSpareThreads        250
     ThreadsPerChild         25
-    MaxRequestWorkers      150
+    MaxRequestWorkers      400
     MaxConnectionsPerChild   0
 </IfModule>