Author: randyk
Date: Tue Apr 25 21:15:34 2006
New Revision: 397080
URL: http://svn.apache.org/viewcvs?rev=397080&view=rev
Log:
The executable on Win32 in Apache/2.2 is httpd.exe, so try to find that if Apache.exe doesn't exist.
Modified:
perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/trunk/lib/Apache/TestConfig.pm?rev=397080&r1=397079&r2=397080&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfig.pm Tue Apr 25 21:15:34 2006
@@ -716,6 +716,15 @@
for my $bindir (qw(bin sbin)) {
my $httpd = catfile $p, $bindir, $vars->{target};
return $httpd if -e $httpd;
+ # The executable on Win32 in Apache/2.2 is httpd.exe,
+ # so try that if Apache.exe doesn't exist
+ if (WIN32) {
+ $httpd = catfile $p, $bindir, 'httpd.EXE';
+ if (-e $httpd) {
+ $vars->{target} = 'httpd.EXE';
+ return $httpd;
+ }
+ }
}
}
}