cvs: php4 /ext/standard var.c

sas Wed Oct 18 11:32:33 2000 EDT Modified files: /php4/ext/standard var.c Log: Back out circular references protection patch. This causes problems with serializing regular variables and object properties. We need a smarter way to tell whether we have serialized one node already. PR: #7291, #7294 Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.73 php4/ext/standard/var.c:1.74 --- php4/ext/standard/var.c:1.73 Fri Sep 29 11:48:40 2000 +++ php4/ext/standard/var.c Wed Oct 18 11:32:32 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.73 2000/09/29 18:48:40 sas Exp $ */ +/* $Id: var.c,v 1.74 2000/10/18 18:32:32 sas Exp $ */ /* {{{ includes @@ -300,27 +300,25 @@ continue; } - if (!(*data)->is_ref) { - switch (i) { - case HASH_KEY_IS_LONG: - MAKE_STD_ZVAL(d); - d->type = IS_LONG; - d->value.lval = index; - php_var_serialize(buf, &d); - FREE_ZVAL(d); - break; - case HASH_KEY_IS_STRING: - MAKE_STD_ZVAL(d); - d->type = IS_STRING; - d->value.str.val = key; - d->value.str.len = strlen(key); - php_var_serialize(buf, &d); - efree(key); - FREE_ZVAL(d); - break; - } - php_var_serialize(buf, data); + switch (i) { + case HASH_KEY_IS_LONG: + MAKE_STD_ZVAL(d); + d->type = IS_LONG; + d->value.lval = index; + php_var_serialize(buf, &d); + FREE_ZVAL(d); + break; + case HASH_KEY_IS_STRING: + MAKE_STD_ZVAL(d); + d->type = IS_STRING; + d->value.str.val = key; + d->value.str.len = strlen(key); + php_var_serialize(buf, &d); + efree(key); + FREE_ZVAL(d); + break; } + php_var_serialize(buf, data); } } STR_CAT(buf, "}", 1);