You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/07/23 14:15:33 UTC
svn commit: r1364600 - in /httpd/httpd/branches/2.4.x: STATUS
docs/conf/extra/httpd-mpm.conf.in
Author: jim
Date: Mon Jul 23 12:15:33 2012
New Revision: 1364600
URL: http://svn.apache.org/viewvc?rev=1364600&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-mpm.conf.in
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1364600&r1=1364599&r2=1364600&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jul 23 12:15:33 2012
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-mpm.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-mpm.conf.in?rev=1364600&r1=1364599&r2=1364600&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-mpm.conf.in (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-mpm.conf.in Mon Jul 23 12:15:33 2012
@@ -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>