cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestServer.pm

[geoff]

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;