This commit was manufactured by cvs2svn to create branch 'PHP_4_3'.

diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt
new file mode 100644 (file)
index 0000000..8f53c0b
--- /dev/null
+++ b/ext/mbstring/tests/mb_send_mail07.phpt
@@ -0,0 +1,41 @@
+--TEST--
+mb_send_mail() test 7 (lang=Korean)
+--SKIPIF--
+<?php
+if (@mb_send_mail() === false || !mb_language("Korean")) {
+       die("skip mb_send_mail() not available");
+}
+if (!@mb_internal_encoding('ISO-2022-KR')) {
+       die("skip ISO-2022-KR encoding is not avaliable on this platform");
+}
+?>
+--INI--
+sendmail_path=cat
+--FILE--
+<?php
+$to = 'example@example.com';
+
+/* default setting */
+mb_send_mail($to, mb_language(), "test");
+
+/* Korean */
+if (mb_language("korean")) {
+       mb_internal_encoding('EUC-KR');
+       mb_send_mail($to, "Å×½ºÆ® ".mb_language(), "Å×½ºÆ®");
+}
+?>
+--EXPECTF--
+To: example@example.com
+Subject: %s
+Mime-Version: 1.0
+Content-Type: text/plain; charset=%s
+Content-Transfer-Encoding: %s
+
+%s
+To: example@example.com
+Subject: =?ISO-2022-KR?B?GyQpQw5FVz06Ri4PIEtvcmVhbg8=?=
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-2022-KR
+Content-Transfer-Encoding: 7bit
+
+\e$)C\ eEW=:F.\ f

diff --git a/ext/mbstring/tests/php_gr_jp_16242.phpt b/ext/mbstring/tests/php_gr_jp_16242.phpt
new file mode 100644 (file)
index 0000000..a4dc60d
--- /dev/null
+++ b/ext/mbstring/tests/php_gr_jp_16242.phpt
@@ -0,0 +1,33 @@
+--TEST--
+php-users@php.gr.jp #16242
+--SKIPIF--
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
+?>
+--FILE--
+<?php
+$ini = <<< HERE
+mbstring.language=Japanese
+mbstring.internal_encoding=UTF-8
+
+HERE;
+
+$tmpfile = tempnam(dirname(__FILE__), "t");
+$fp = fopen($tmpfile, 'w');
+fwrite($fp, $ini);
+fclose($fp);
+
+$cmd = 'echo "<?php ';
+$cmd .= "var_dump(ini_get('mbstring.language'));";
+$cmd .= "var_dump(ini_get('mbstring.internal_encoding'));";
+$cmd .= 'var_dump(mb_internal_encoding());';
+$cmd .= ' ?>" |'.$_ENV["TEST_PHP_EXECUTABLE"].' -c '.$tmpfile;
+
+system($cmd);
+
+unlink($tmpfile);
+?>
+--EXPECT--
+string(8) "Japanese"
+string(5) "UTF-8"
+string(5) "UTF-8"