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

[dougm]

dougm       01/10/20 11:05:01

  Modified:    perl-framework/Apache-Test/lib/Apache TestServer.pm
  Log:
  if t/TEST -start was run, there is no win32obj, so use KillProcess with 
httpd.pid to stop the server
  
  Revision  Changes    Path
  1.39      +8 -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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- TestServer.pm     2001/10/20 18:01:32     1.38
  +++ TestServer.pm     2001/10/20 18:05:01     1.39
  @@ -283,9 +283,15 @@
   
       if (Apache::TestConfig::WIN32) {
           if ($self->{config}->{win32obj}) {
  -            $self->{config}->{win32obj}->Kill(-1);
  +            $self->{config}->{win32obj}->Kill(0);
               return 1;
           }
  +        else {
  +            require Win32::Process;
  +            my $pid = $self->pid;
  +            Win32::Process::KillProcess($pid, 0);
  +            return 1;
  +     }
       }
   
       my $pid = 0;
  @@ -393,7 +399,7 @@
       print "$cmd\n";
   
       if (Apache::TestConfig::WIN32) {
  -        #make sure only 1 process is used for win32
  +        #make sure only 1 process is started for win32
           #else Kill will only shutdown the parent
           my $one_process = $self->version_of(\%one_process);
           require Win32::Process;