tony2001 Thu Jul 20 09:19:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/json JSON_parser.c
Log:
MFH: ZTS fix
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.1.2.1
php-src/ext/json/JSON_parser.c:1.1.2.2
--- php-src/ext/json/JSON_parser.c:1.1.2.1 Thu Jul 20 08:24:31 2006
+++ php-src/ext/json/JSON_parser.c Thu Jul 20 09:19:02 2006
@@ -338,7 +338,7 @@
{
if (!assoc)
{
- add_property_zval_ex(root, (key->len ? key->c : "_empty_"),
(key->len ? (key->len + 1) : sizeof("_empty_")), child);
+ add_property_zval_ex(root, (key->len ? key->c : "_empty_"),
(key->len ? (key->len + 1) : sizeof("_empty_")), child TSRMLS_CC);
#if PHP_MAJOR_VERSION >= 5
ZVAL_DELREF(child);
#endif
@@ -481,7 +481,7 @@
if (!assoc)
{
- add_property_zval_ex(JSON(the_zstack)[JSON(the_top)],
(key.len ? key.c : "_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")),
mval);
+ add_property_zval_ex(JSON(the_zstack)[JSON(the_top)],
(key.len ? key.c : "_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")),
mval TSRMLS_CC);
#if PHP_MAJOR_VERSION >= 5
ZVAL_DELREF(mval);
#endif
@@ -604,7 +604,7 @@
{
if (!assoc)
{
-
add_property_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c :
"_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval);
+
add_property_zval_ex(JSON(the_zstack)[JSON(the_top)], (key.len ? key.c :
"_empty_"), (key.len ? (key.len + 1) : sizeof("_empty_")), mval TSRMLS_CC);
#if PHP_MAJOR_VERSION >= 5
ZVAL_DELREF(mval);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
