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

diff --git a/ext/mbstring/tests/bug25140.phpt b/ext/mbstring/tests/bug25140.phpt
new file mode 100644 (file)
index 0000000..0b20912
--- /dev/null
+++ b/ext/mbstring/tests/bug25140.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #25140 (mb_convert_encoding returns FALSE on an empty string)
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+--FILE--
+<?php
+var_dump( mb_convert_encoding( '', 'SJIS', 'EUC-JP' ) );
+?>
+--EXPECT--
+string(0) ""