X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fskipif.inc;h=76c3bd793576f73639a62860629055f7c79c6367;hb=f3b5b84017131e5354aacaa01836d317dad38686;hp=85dbac2902d2c2ae7915b9fe9dcc18d4d6d053c5;hpb=e61393c76eb220de660f2b95111f9bf9e072fe1d;p=m6w6%2Fext-http

diff --git a/tests/skipif.inc b/tests/skipif.inc
index 85dbac2..76c3bd7 100644
--- a/tests/skipif.inc
+++ b/tests/skipif.inc
@@ -1,13 +1,17 @@
 <?php
 _ext("http");
 
-function _ext($ext) { 
+function _ext($ext) {
 	if (!extension_loaded($ext)) {
 		die("skip $ext extension needed\n");
 	}
 }
 
 function utf8locale() {
+	$locale = setlocale(LC_CTYPE, null);
+	if (stristr($locale, "utf") && substr($locale, -1) === "8") {
+		return true;
+	}
 	if (stristr(setlocale(LC_CTYPE, "C.UTF-8"), "utf")) {
 		return true;
 	}
@@ -37,8 +41,8 @@ function skip_client_test($message = "skip need a client driver\n") {
 }
 
 function skip_curl_test($version) {
-	if (!version_compare(http\Client\Curl\Versions\CURL, $version, "<=")) {
-		die("need at least libcurl version $version\n");
+	if (!version_compare(http\Client\Curl\Versions\CURL, $version, ">=")) {
+		die("skip need at least libcurl version $version\n");
 	}
 }
 
@@ -49,7 +53,7 @@ function skip_http2_test($message = "skip need http2 support") {
 	if (!(http\Client\Curl\FEATURES & http\Client\Curl\Features\HTTP2)) {
 		die("$message (FEATURES & HTTP2)\n");
 	}
-	foreach (explode(":", $_ENV["PATH"]) as $path) {
+	foreach (explode(":", getenv("PATH")) as $path) {
 		if (is_executable($path . "/nghttpd")) {
 			return;
 		}