Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 43950 invoked from network); 7 May 2004 18:02:50 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 7 May 2004 18:02:50 -0000 Received: (qmail 97404 invoked by uid 500); 7 May 2004 18:02:43 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 97345 invoked by uid 500); 7 May 2004 18:02:42 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@perl.apache.org Delivered-To: mailing list modperl-cvs@perl.apache.org Received: (qmail 97311 invoked by uid 500); 7 May 2004 18:02:42 -0000 Delivered-To: apmail-modperl-2.0-cvs@apache.org Date: 7 May 2004 18:02:47 -0000 Message-ID: <20040507180247.43887.qmail@minotaur.apache.org> From: stas@apache.org To: modperl-2.0-cvs@apache.org Subject: cvs commit: modperl-2.0 Changes X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N stas 2004/05/07 11:02:47 Modified: ModPerl-Registry/t TEST.PL lib/ModPerl TestRun.pm . Changes Log: use the new Apache-Test attribute -minclient in the test suites. Now along with the default maxclients = minclients+1, we no longer should get 'server reached MaxClients setting' errors. Revision Changes Path 1.15 +2 -2 modperl-2.0/ModPerl-Registry/t/TEST.PL Index: TEST.PL =================================================================== RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/TEST.PL,v retrieving revision 1.14 retrieving revision 1.15 diff -u -u -r1.14 -r1.15 --- TEST.PL 6 Mar 2004 01:52:47 -0000 1.14 +++ TEST.PL 7 May 2004 18:02:47 -0000 1.15 @@ -16,7 +16,7 @@ use base qw(Apache::TestRunPerl); # redirect tests require 2 servers -use constant MIN_MAXCLIENTS => 2; +use constant MIN_CLIENTS => 2; use File::Spec::Functions qw(catdir); use File::Basename qw(dirname); @@ -42,7 +42,7 @@ $ENV{APACHE_TEST_STARTUP_TIMEOUT} || DEFAULT_STARTUP_TIMEOUT; - $self->{conf_opts}->{maxclients} ||= MIN_MAXCLIENTS; + $self->{conf_opts}->{minclients} ||= MIN_CLIENTS; return $self->SUPER::new_test_config; } 1.21 +2 -2 modperl-2.0/lib/ModPerl/TestRun.pm Index: TestRun.pm =================================================================== RCS file: /home/cvs/modperl-2.0/lib/ModPerl/TestRun.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -u -u -r1.20 -r1.21 --- TestRun.pm 5 Mar 2004 02:42:32 -0000 1.20 +++ TestRun.pm 7 May 2004 18:02:47 -0000 1.21 @@ -24,7 +24,7 @@ # some mp2 tests require more than one server instance to be available # without which the server may hang, waiting for the single server # become available -use constant MIN_MAXCLIENTS => 2; +use constant MIN_CLIENTS => 2; sub new_test_config { my $self = shift; @@ -35,7 +35,7 @@ $ENV{APACHE_TEST_STARTUP_TIMEOUT} || Apache::Build->build_config->mpm_is_threaded() ? 300 : 120; - $self->{conf_opts}->{maxclients} ||= MIN_MAXCLIENTS; + $self->{conf_opts}->{minclients} ||= MIN_CLIENTS; ModPerl::TestConfig->new($self->{conf_opts}); } 1.367 +4 -0 modperl-2.0/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.366 retrieving revision 1.367 diff -u -u -r1.366 -r1.367 --- Changes 4 May 2004 06:42:00 -0000 1.366 +++ Changes 7 May 2004 18:02:47 -0000 1.367 @@ -12,6 +12,10 @@ =item 1.99_14-dev +use the new Apache-Test attribute -minclient in the test suites. Now +along with the default maxclients = minclients+1, we no longer should +get 'server reached MaxClients setting' errors. [Stas] + new API for APR::Socket recv() and send() + updated tests [Stas] add infrastructure for new ModPerl::Const constants and the first