From 7b7a4aac86fee91ef39b09fe8fa5aa36b32a2f41 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 16 Aug 2005 09:25:04 +0000 Subject: [PATCH] Unicode support --- ext/standard/tests/array/bug25708.phpt | 20 ++++++++++---------- ext/standard/tests/array/bug26458.phpt | Bin 395 -> 651 bytes ext/standard/var.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ext/standard/tests/array/bug25708.phpt b/ext/standard/tests/array/bug25708.phpt index 954c5a5d5b..fdaed851f2 100644 --- 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 GIT binary patch delta 170 zcmeBX?q=Q4&B&~)8#?iUxNxbGBZHGttgRiFfSPYazF*gT^fw<;I bAQo7Oi9)SHQEFOperaBbhM^`iS1lI+xEm^^ delta 7 OcmeBX?PlK4%?JPq+yYww diff --git a/ext/standard/var.c b/ext/standard/var.c index 8df20cb98f..609a0d8fe4 100644 --- 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); -- 2.50.1