X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Furlparser006.phpt;h=1ef4c593feb5ab1e7704e6de687ab6c8c7138f94;hb=85ef852aae2aaa877e901f5e2b09f32d9cc6381a;hp=57f6a8b6a4767f174599c4de56c0d8f32bffdd7c;hpb=2e92ec70991d53cb3d6d710ae7a6b3a6b31ec978;p=m6w6%2Fext-http

diff --git a/tests/urlparser006.phpt b/tests/urlparser006.phpt
index 57f6a8b..1ef4c59 100644
--- a/tests/urlparser006.phpt
+++ b/tests/urlparser006.phpt
@@ -4,15 +4,16 @@ url parser multibyte/locale/idna
 <?php
 include "skipif.inc";
 if (!defined("http\\Url::PARSE_MBLOC") or
-	!defined("http\\Url::PARSE_TOIDN") or
 	!defined("http\\Url::PARSE_TOIDN_2003") or
-	!stristr(setlocale(LC_CTYPE, NULL), ".utf")) {
-	die("skip need http\\Url::PARSE_MBLOC|http\\Url::PARSE_TOIDN support and LC_CTYPE=*.UTF-8");
+	!utf8locale()) {
+	die("skip need http\\Url::PARSE_MBLOC|http\\Url::PARSE_TOIDN_2003 support and LC_CTYPE=*.UTF-8");
 }
 ?>
 --FILE--
 <?php
 echo "Test\n";
+include "skipif.inc";
+utf8locale();
 
 $urls = array(
 	"s\xc3\xa7heme:",
@@ -22,7 +23,7 @@ $urls = array(
 
 foreach ($urls as $url) {
 	printf("\n%s\n", $url);
-	var_dump(new http\Url($url, null, http\Url::PARSE_MBLOC|http\Url::PARSE_TOIDN|http\Url::PARSE_TOIDN_2003));
+	var_dump(new http\Url($url, null, http\Url::PARSE_MBLOC|http\Url::PARSE_TOIDN_2003));
 }
 ?>
 DONE