rrichards Mon Aug 25 19:38:04 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/spl spl_array.c
Log:
no zstr in 5_3
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.23&r2=1.71.2.17.2.13.2.24&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.23
php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.24
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.23 Mon Aug 25 19:07:20 2008
+++ php-src/ext/spl/spl_array.c Mon Aug 25 19:38:04 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.13.2.23 2008/08/25 19:07:20 jani Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.13.2.24 2008/08/25 19:38:04 rrichards Exp $
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1663,7 +1663,7 @@
}
} /* }}} */
-int spl_array_unserialize(zval **object, zend_class_entry *ce, int type, const
zstr buf, zend_uint buf_len, zend_unserialize_data *data TSRMLS_DC) /* {{{ */
+int spl_array_unserialize(zval **object, zend_class_entry *ce, const unsigned
char *buf, zend_uint buf_len, zend_unserialize_data *data TSRMLS_DC)
{
spl_array_object *intern;
@@ -1674,7 +1674,7 @@
zval *zdata;
php_unserialize_data_t *before;
MAKE_STD_ZVAL(zdata);
- ZVAL_ZSTRL(zdata, type, buf, buf_len, 1);
+ ZVAL_STRINGL(zdata, buf, buf_len, 1);
before = intern->unserialize_data;
intern->unserialize_data = (php_unserialize_data_t *)data;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
