Unicode support

diff --git a/ext/standard/tests/array/bug25708.phpt b/ext/standard/tests/array/bug25708.phpt
index 954c5a5d5bc39d10f0ba74f721837cd38004830a..fdaed851f264037b06332eeaacd52578abb4a0de 100644 (file)
--- a/ext/standard/tests/array/bug25708.phpt
+++ b/ext/standard/tests/array/bug25708.phpt
@@ -252,9 +252,9 @@ long(3) refcount(1)
 long(3) refcount(2)
 --
 long(4) refcount(1)
-unicode(1) "x" refcount(1)
+unicode(1) "x" { 0078 } refcount(1)
 long(4) refcount(1)
-unicode(1) "x" refcount(1)
+unicode(1) "x" { 0078 } refcount(1)
 long(3) refcount(2)
 --
 long(1) refcount(2)
@@ -290,9 +290,9 @@ long(3) refcount(1)
 long(3) refcount(2)
 --
 long(4) refcount(1)
-unicode(1) "x" refcount(1)
+unicode(1) "x" { 0078 } refcount(1)
 long(4) refcount(1)
-unicode(1) "x" refcount(1)
+unicode(1) "x" { 0078 } refcount(1)
 long(3) refcount(2)
 --
 long(1) refcount(2)
@@ -328,9 +328,9 @@ long(3) refcount(1)
 long(3) refcount(2)
 --
 long(4) refcount(1)
-unicode(1) "x" refcount(1)
+unicode(1) "x" { 0078 } refcount(1)
 long(4) refcount(1)
-unicode(1) "x" refcount(1)
+unicode(1) "x" { 0078 } refcount(1)
 long(3) refcount(2)
 --
 long(1) refcount(2)
@@ -366,13 +366,13 @@ long(3) refcount(1)
 long(3) refcount(2)
 --
 long(4) refcount(1)
-unicode(1) "x" refcount(1)
+unicode(1) "x" { 0078 } refcount(1)
 long(4) refcount(1)
-unicode(1) "x" refcount(1)
+unicode(1) "x" { 0078 } refcount(1)
 long(3) refcount(2)
 --
 long(1) refcount(2)
 long(2) refcount(2)
 ----r
-unicode(2) "ok" refcount(2)
-unicode(2) "ok" refcount(2)
+unicode(2) "ok" { 006f 006b } refcount(2)
+unicode(2) "ok" { 006f 006b } refcount(2)

diff --git a/ext/standard/tests/array/bug26458.phpt b/ext/standard/tests/array/bug26458.phpt
index d24e1f151b01ed08cee72a60d760ba87a9c06332..105caee0de7eeb98f4017d8ac81b8c803b3b1d34 100644 (file)
Binary files a/ext/standard/tests/array/bug26458.phpt and b/ext/standard/tests/array/bug26458.phpt differ

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 8df20cb98fd363bc29d958f77fe6ced9db6e9a7a..609a0d8fe4b14890029b4089e951e3564d5f7317 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -380,7 +380,7 @@ PHPAPI void php_debug_zval_dump(zval **struc, int level, int verbose TSRMLS_DC)
                /* temporary, for debugging */
                php_printf("%sunicode(%d) ", COMMON, u_countChar32((*struc)->value.ustr.val, (*struc)->value.ustr.len));
                php_var_dump_unicode((*struc)->value.ustr.val, (*struc)->value.ustr.len, verbose TSRMLS_CC);
-               php_printf("\" refcount(%u)\n", Z_REFCOUNT_PP(struc));
+               php_printf(" refcount(%u)\n", Z_REFCOUNT_PP(struc));
                break;
        case IS_ARRAY:
                myht = Z_ARRVAL_PP(struc);