From 14a5596346037a4b772bbb5d42a884943dc25a05 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 12 Aug 2008 07:21:39 +0000 Subject: - Andy Tsouladze fixed runtests.pl to not attempt to execute the stunnel _directory_ if that happened to appear in the path! --- CHANGES | 4 ++++ RELEASE-NOTES | 3 ++- tests/runtests.pl | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index ed925e80c..64d239912 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,10 @@ Changelog +Daniel Stenberg (12 Aug 2008) +- Andy Tsouladze fixed runtests.pl to not attempt to execute the stunnel + _directory_ if that happened to appear in the path! + Yang Tse (12 Aug 2008) - Added macros for minimum-width signed and unsigned curl_off_t integer constants CURL_OFF_T_C and CURL_OFF_TU_C. The clever double helper macro diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 8d12c7d5d..f2dd2e702 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -51,6 +51,7 @@ This release includes the following bugfixes: o re-use of connections with failed SSL connects in the multi interface o NTLM over proxy state was wrongly cleared when host connection was closed o Windows SSPI DLL loading is now done in curl_global_init() + o runtests.pl has an improved find-stunnel-and-invoke This release includes the following known bugs: @@ -72,7 +73,7 @@ advice from friends like these: Phil Pellouchoud, Eduard Bloch, John Lightsey, Stephen Collyer, Tor Arntsen, Rolland Dudemaine, Phil Blundell, Scott Barrett, Andreas Schuldei, Peter Lamberg, David Bau, Pramod Sharma, Yehoshua Hershberg, - Constantine Sapuntzakis, Lars Nilsson + Constantine Sapuntzakis, Lars Nilsson, Andy Tsouladze Thanks! (and sorry if I forgot to mention someone) diff --git a/tests/runtests.pl b/tests/runtests.pl index de300df4d..169a347e1 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -388,7 +388,8 @@ sub checkcmd { my @paths=(split(":", $ENV{'PATH'}), "/usr/sbin", "/usr/local/sbin", "/sbin", "/usr/bin", "/usr/local/bin" ); for(@paths) { - if( -x "$_/$cmd") { + if( -x "$_/$cmd" && ! -d "$_/$cmd") { + # executable bit but not a directory! return "$_/$cmd"; } } -- cgit v1.2.3