Randy Kobes wrote:
On Sat, 10 Jan 2004, Stas Bekman wrote:
[EMAIL PROTECTED] wrote:
randyk 2004/01/10 14:07:17
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
TestRun.pm
Log:
On Win32, multiple options for Apache.exe can be returned which differ
only by the case of the .exe extension or by the directory separator.
These changes bring things into line with what is returned from which().
[...]
1.136 +2 -2
httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Index: TestRun.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- TestRun.pm 8 Jan 2004 04:54:06 -0000 1.135
+++ TestRun.pm 10 Jan 2004 22:07:17 -0000 1.136
@@ -1346,8 +1346,8 @@
for (grep defined $_,
map({ catfile $vars->{$_}, $vars->{target} } qw(sbindir bindir)),
$test_config->default_httpd, which($vars->{target}),
- $ENV{APACHE}, which('apache'), which('httpd'),
- $ENV{APACHE2}, which('apache2'), which('httpd2')) {
+ $ENV{APACHE}, which('Apache'), which('httpd'),
+ $ENV{APACHE2}, which('Apache2'), which('httpd2')) {
$choices{$_}++ if -e $_ && -x _;
}
my $optional = 0;
yes, but we need which('apache') too for unix. so please:
- $ENV{APACHE}, which('apache'), which('httpd'),
- $ENV{APACHE2}, which('apache2'), which('httpd2')) {
+ $ENV{APACHE}, which('apache'), which('Apache'),
which('httpd'),
+ $ENV{APACHE2}, which('apache2'), which('Apache2'),
which('httpd2')) {
Sorry about that - I'll revert that change (I just tried,
but got an error message about insufficient space left on a
device). Actually, looking for both 'apache' and 'Apache'
leads back to the same problem on Win32 that, when the list
of Apache binaries is reported, both 'apache' and 'Apache'
are listed (with the same paths), so a different approach is
needed.
So check that the path and lowercased filename match and exclude those on
win32?
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:[EMAIL PROTECTED] http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
