Fixed the tests so that they won't be affected by the ini setting of

default_charset

diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt
index b2b5a7cd00c919b1f72741f964ef3d4b875918be..3158cf44c66dc76e07d33f14fedddda7bbedf6d0 100644 (file)
--- a/ext/standard/tests/strings/htmlentities02.phpt
+++ b/ext/standard/tests/strings/htmlentities02.phpt
@@ -9,7 +9,8 @@ if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) == 0) {
 ?>
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+default_charset=
+mbstring.internal_encoding=none
 --FILE--
 <?php
        setlocale( LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15" );

diff --git a/ext/standard/tests/strings/htmlentities03.phpt b/ext/standard/tests/strings/htmlentities03.phpt
index 2547bbe2138cebfcea9f4d9963d6a58a4574dbde..7e933544fe52a055c767e68dda1d52f2d2d82b58 100644 (file)
--- a/ext/standard/tests/strings/htmlentities03.phpt
+++ b/ext/standard/tests/strings/htmlentities03.phpt
@@ -9,7 +9,8 @@ if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) == 0) {
 ?>
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+default_charset=
+mbstring.internal_encoding=none
 --FILE--
 <?php
        setlocale( LC_CTYPE, "de_DE.ISO-8859-1", "de_DE.ISO8859-1");

diff --git a/ext/standard/tests/strings/htmlentities04.phpt b/ext/standard/tests/strings/htmlentities04.phpt
index 6e551338b6994cf5d5c8a414cff0018618053fd5..8e362d073cc563025276fe3577224c56b05f26b9 100644 (file)
--- a/ext/standard/tests/strings/htmlentities04.phpt
+++ b/ext/standard/tests/strings/htmlentities04.phpt
@@ -9,7 +9,8 @@ if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) == 0) {
 ?>
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+default_charset=
+mbstring.internal_encoding=none
 --FILE--
 <?php
        setlocale( LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP" );