stas 2004/01/27 22:02:50
Modified: lib/ModPerl TestRun.pm
. Changes
Log:
make 't/TEST -startup_timeout secs' working (previously user's value
was ignored)
Revision Changes Path
1.16 +7 -6 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.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- TestRun.pm 15 Dec 2003 02:50:22 -0000 1.15
+++ TestRun.pm 28 Jan 2004 06:02:50 -0000 1.16
@@ -5,21 +5,22 @@
use base qw(Apache::TestRunPerl);
+use Apache::Build;
+
# 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 Apache::Build;
-my $build = Apache::Build->build_config;
+# default timeout in secs (threaded mpms are extremely slow to
+# startup, due to a slow perl_clone operation)
+use constant DEFAULT_STARTUP_TIMEOUT =>
+ Apache::Build->build_config->mpm_is_threaded() ? 180 : 120;
sub new_test_config {
my $self = shift;
- # timeout in secs (threaded mpms are extremely slow to startup,
- # due to a slow perl_clone operation)
- $self->{conf_opts}->{startup_timeout} =
- $build->mpm_is_threaded() ? 180 : 120;
+ $self->{conf_opts}->{startup_timeout} ||= DEFAULT_STARTUP_TIMEOUT;
$self->{conf_opts}->{maxclients} ||= MIN_MAXCLIENTS;
1.312 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -u -r1.311 -r1.312
--- Changes 27 Jan 2004 16:35:27 -0000 1.311
+++ Changes 28 Jan 2004 06:02:50 -0000 1.312
@@ -12,6 +12,9 @@
=item 1.99_13-dev
+make 't/TEST -startup_timeout secs' working (previously user's value
+was ignored) [Stas]
+
ModPerl::Registry and friends now support non-parsed headers scripts,
whose filename =~ /^nph-/, identically to mod_cgi. + test [Stas]
