You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by ge...@apache.org on 2004/03/04 23:21:27 UTC
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestServer.pm
geoff 2004/03/04 14:21:27
Modified: perl-framework/Apache-Test Changes
perl-framework/Apache-Test/lib/Apache TestServer.pm
Log:
$ENV{APACHE_TEST_STARTUP_TIMEOUT} now supersedes -startup_timeout
Revision Changes Path
1.102 +3 -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.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- Changes 4 Mar 2004 05:51:31 -0000 1.101
+++ Changes 4 Mar 2004 22:21:27 -0000 1.102
@@ -8,6 +8,9 @@
=item 1.09-dev
+$ENV{APACHE_TEST_STARTUP_TIMEOUT} now supersedes -startup_timeout
+[Edouard Lagache]
+
Updated to the new Apache License Version 2.0 [Gozer]
handle cases on Win32 when supplied paths have spaces in their
1.79 +2 -2 httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm
Index: TestServer.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- TestServer.pm 4 Mar 2004 05:51:31 -0000 1.78
+++ TestServer.pm 4 Mar 2004 22:21:27 -0000 1.79
@@ -542,8 +542,8 @@
$mpm = "($mpm MPM)" if $mpm;
print "using $version $mpm\n";
- my $timeout = $vars->{startup_timeout} ||
- $ENV{APACHE_TEST_STARTUP_TIMEOUT} ||
+ my $timeout = $ENV{APACHE_TEST_STARTUP_TIMEOUT} ||
+ $vars->{startup_timeout} ||
60;
my $start_time = time;
Re: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache
TestServer.pm
Posted by Stas Bekman <st...@stason.org>.
Philippe M. Chiasson wrote:
> On Thu, 2004-03-04 at 22:21 +0000, geoff@apache.org wrote:
>
>>geoff 2004/03/04 14:21:27
>>
>> Modified: perl-framework/Apache-Test Changes
>> perl-framework/Apache-Test/lib/Apache TestServer.pm
>> Log:
>> $ENV{APACHE_TEST_STARTUP_TIMEOUT} now supersedes -startup_timeout
>>[...]
>
>
> What's the reason for this change? I almost always expect that command
> line arguments supercede env variables.. i.e.
>
> $> CVSROOT=foo cvs -d bar co foo
> Bad CVSROOT: `bar'.
>
> What you can see should win over what you can't see, IMO
Yup, I've already pointed that out. I guess Geoff is not around.
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
Re: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache
TestServer.pm
Posted by Stas Bekman <st...@stason.org>.
Geoffrey Young wrote:
>>> $ENV{APACHE_TEST_STARTUP_TIMEOUT} now supersedes -startup_timeout
>>>[...]
>>
>>
>>What's the reason for this change?
>
>
> it was a follow up from something on modperl@
>
>
>>I almost always expect that command
>>line arguments supercede env variables.. i.e.
>>
>>$> CVSROOT=foo cvs -d bar co foo
>>Bad CVSROOT: `bar'.
>>
>>What you can see should win over what you can't see, IMO
>
>
> yeah, I thought about this after committing it - it's definitely better the
> way it was. but it leaves mod_perl users in a lurch if they want to up the
> startup time. the better solution is probably to have ModPerl::TestRun look
> at %ENV before it sets the startup timeout.
>
> I'll fit that tomorrow unless you or stas beat me to it.
I've committed that change already. But I'll leave it to you to revert the one
you committed ;)
--
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
Re: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache
TestServer.pm
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
>> $ENV{APACHE_TEST_STARTUP_TIMEOUT} now supersedes -startup_timeout
>>[...]
>
>
> What's the reason for this change?
it was a follow up from something on modperl@
> I almost always expect that command
> line arguments supercede env variables.. i.e.
>
> $> CVSROOT=foo cvs -d bar co foo
> Bad CVSROOT: `bar'.
>
> What you can see should win over what you can't see, IMO
yeah, I thought about this after committing it - it's definitely better the
way it was. but it leaves mod_perl users in a lurch if they want to up the
startup time. the better solution is probably to have ModPerl::TestRun look
at %ENV before it sets the startup timeout.
I'll fit that tomorrow unless you or stas beat me to it.
--Geoff
Re: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache
TestServer.pm
Posted by "Philippe M. Chiasson" <go...@apache.org>.
On Thu, 2004-03-04 at 22:21 +0000, geoff@apache.org wrote:
> geoff 2004/03/04 14:21:27
>
> Modified: perl-framework/Apache-Test Changes
> perl-framework/Apache-Test/lib/Apache TestServer.pm
> Log:
> $ENV{APACHE_TEST_STARTUP_TIMEOUT} now supersedes -startup_timeout
> [...]
What's the reason for this change? I almost always expect that command
line arguments supercede env variables.. i.e.
$> CVSROOT=foo cvs -d bar co foo
Bad CVSROOT: `bar'.
What you can see should win over what you can't see, IMO
--
Philippe M. Chiasson m/gozer\@(apache|cpan|ectoplasm)\.org/ GPG KeyID : 88C3A5A5
http://gozer.ectoplasm.org/ F9BF E0C2 480E 7680 1AE5 3631 CB32 A107 88C3A5A5