stas 2004/01/07 20:06:27
Modified: perl-framework/Apache-Test Changes
perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
fix Apache::TestConfig::which to check that the found file is a plain file
Revision Changes Path
1.77 +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.76
retrieving revision 1.77
diff -u -u -r1.76 -r1.77
--- Changes 7 Jan 2004 17:51:21 -0000 1.76
+++ Changes 8 Jan 2004 04:06:26 -0000 1.77
@@ -8,6 +8,9 @@
=item 1.08_dev
+fix Apache::TestConfig::which to check that the found file is a plain
+file [Stas]
+
implementing custom interactive and non-interactive (with the -save
option) reusable configuration for -httpd, -apxs, -user, -group, and
-port [Randy Kobes, Stas]
1.194 +2 -4
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -u -r1.193 -r1.194
--- TestConfig.pm 7 Jan 2004 17:51:21 -0000 1.193
+++ TestConfig.pm 8 Jan 2004 04:06:27 -0000 1.194
@@ -1407,8 +1407,6 @@
return undef unless $program;
- my @results = ();
-
for my $base (map { catfile($_, $program) } File::Spec->path()) {
if ($ENV{HOME} and not WIN32) {
# only works on Unix, but that's normal:
@@ -1416,11 +1414,11 @@
$base =~ s/~/$ENV{HOME}/o;
}
- return $base if -x $base;
+ return $base if -x $base && -f _;
if (WIN32) {
for my $ext (@path_ext) {
- return "$base.$ext" if -x "$base.$ext";
+ return "$base.$ext" if -x "$base.$ext" && -f _;
}
}
}
