improved zend-multibyte detection.

This commit is contained in:
Rui Hirokawa 2008-07-06 15:36:19 +00:00
parent d771fa6da1
commit 0686ad4313
2 changed files with 10 additions and 6 deletions

View File

@ -2,9 +2,11 @@
test for mbstring script_encoding for flex unsafe encoding (Shift_JIS)
--SKIPIF--
<?php
ini_set("mbstring.script_encoding","SJIS");
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
die("skip zend-multibyte is not available");
if (!in_array("detect_unicode", array_keys(ini_get_all()))) {
die("skip Requires configure --enable-zend-multibyte option");
}
if (!extension_loaded("mbstring")) {
die("skip Requires mbstring extension");
}
?>
--INI--

View File

@ -2,9 +2,11 @@
encoding conversion from script encoding into internal encoding
--SKIPIF--
<?php
ini_set("mbstring.script_encoding","SJIS");
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
die("skip zend-multibyte is not available");
if (!in_array("detect_unicode", array_keys(ini_get_all()))) {
die("skip Requires configure --enable-zend-multibyte option");
}
if (!extension_loaded("mbstring")) {
die("skip Requires mbstring extension");
}
?>
--INI--