stas 2004/06/29 19:15:03
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
perl-framework/Apache-Test Changes
Log:
make a special case for threaded mpm configuration, to ensure that
unless maxclients was specified, MaxClients will be exactly twice
bigger than ThreadsPerChild (minclients), since if we don't do that,
Apache will reduce MaxClients to the same value as
ThreadsPerChild.
Revision Changes Path
1.226 +8 -1
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -u -r1.225 -r1.226
--- TestConfig.pm 31 May 2004 03:49:40 -0000 1.225
+++ TestConfig.pm 30 Jun 2004 02:15:02 -0000 1.226
@@ -282,8 +282,15 @@
$vars->{serveradmin} ||= $self->default_serveradmin;
$vars->{minclients} ||= 1;
+ my $maxclientspreset = $vars->{maxclients} || 0;
# prevent 'server reached MaxClients setting' errors
$vars->{maxclients} ||= $vars->{minclients} + 1;
+ # for threaded mpms MaxClients must be a multiple of
+ # ThreadsPerChild (i.e. maxclients % minclients == 0)
+ # so unless -maxclients was explicitly specified use a double of
+ # minclients
+ $vars->{maxclientsthreadedmpm} =
+ $maxclientspreset || $vars->{minclients} * 2;
$vars->{proxy} ||= 'off';
$vars->{proxyssl_url} ||= '';
@@ -1863,7 +1870,7 @@
MinSpareThreads @MinClients@
MaxSpareThreads @MinClients@
ThreadsPerChild @MinClients@
- MaxClients @MaxClients@
+ MaxClients @MaxClientsThreadedMPM@
MaxRequestsPerChild 0
</IfModule>
1.145 +6 -0 httpd-test/perl-framework/Apache-Test/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -u -r1.144 -r1.145
--- Changes 28 Jun 2004 16:53:34 -0000 1.144
+++ Changes 30 Jun 2004 02:15:02 -0000 1.145
@@ -8,6 +8,12 @@
=item 1.13-dev
+make a special case for threaded mpm configuration, to ensure that
+unless maxclients was specified, MaxClients will be exactly twice
+bigger than ThreadsPerChild (minclients), since if we don't do that,
+Apache will reduce MaxClients to the same value as
+ThreadsPerChild. [Stas]
+
=item 1.12 - June 28, 2004
