[PHP-CVS] cvs: php-src /ext/standard var_unserializer.c var_unserializer.re /ext/standard/tests/serialize 002.phpt

[Dmitry Stogov]

dmitry          Mon Mar 27 14:19:18 2006 UTC

  Modified files:              
    /php-src/ext/standard       var_unserializer.c var_unserializer.re 
    /php-src/ext/standard/tests/serialize       002.phpt 
  Log:
  Unicode support
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/var_unserializer.c?r1=1.79&r2=1.80&diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.79 
php-src/ext/standard/var_unserializer.c:1.80
--- php-src/ext/standard/var_unserializer.c:1.79        Mon Mar 27 13:37:46 2006
+++ php-src/ext/standard/var_unserializer.c     Mon Mar 27 14:19:18 2006
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.10 on Mon Mar 27 17:29:16 2006 */
+/* Generated by re2c 0.9.10 on Mon Mar 27 17:59:43 2006 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: var_unserializer.c,v 1.79 2006/03/27 13:37:46 dmitry Exp $ */
+/* $Id: var_unserializer.c,v 1.80 2006/03/27 14:19:18 dmitry Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -838,7 +838,7 @@
        *p = YYCURSOR;
 
        INIT_PZVAL(*rval);
-       ZVAL_STRINGL(*rval, str, len, 1);
+       ZVAL_RT_STRINGL(*rval, str, len, 1);
        return 1;
 }
 #line 845 "ext/standard/var_unserializer.c"
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/var_unserializer.re?r1=1.58&r2=1.59&diff_format=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.58 
php-src/ext/standard/var_unserializer.re:1.59
--- php-src/ext/standard/var_unserializer.re:1.58       Mon Mar 27 13:37:46 2006
+++ php-src/ext/standard/var_unserializer.re    Mon Mar 27 14:19:18 2006
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: var_unserializer.re,v 1.58 2006/03/27 13:37:46 dmitry Exp $ */
+/* $Id: var_unserializer.re,v 1.59 2006/03/27 14:19:18 dmitry Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -507,7 +507,7 @@
        *p = YYCURSOR;
 
        INIT_PZVAL(*rval);
-       ZVAL_STRINGL(*rval, str, len, 1);
+       ZVAL_RT_STRINGL(*rval, str, len, 1);
        return 1;
 }
 
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/serialize/002.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/serialize/002.phpt
diff -u php-src/ext/standard/tests/serialize/002.phpt:1.4 
php-src/ext/standard/tests/serialize/002.phpt:1.5
--- php-src/ext/standard/tests/serialize/002.phpt:1.4   Sun Sep 26 18:28:07 2004
+++ php-src/ext/standard/tests/serialize/002.phpt       Mon Mar 27 14:19:18 2006
@@ -42,3 +42,32 @@
 object(stdClass)#%d (0) {
 }
 ===DONE===
+--UEXPECTF--
+bool(false)
+bool(true)
+int(823)
+unicode(0) ""
+unicode(3) "foo"
+array(1) {
+  [0]=>
+  unicode(2) "12"
+}
+array(2) {
+  [0]=>
+  array(0) {
+  }
+  [1]=>
+  array(0) {
+  }
+}
+array(3) {
+  [0]=>
+  unicode(3) "foo"
+  [1]=>
+  unicode(3) "bar"
+  [2]=>
+  unicode(3) "baz"
+}
+object(stdClass)#%d (0) {
+}
+===DONE===

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php