diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-04-11 09:27:47 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-04-11 09:27:47 +0000 |
| commit | 37eee73274a34278bfc0c28101a571e001da9ad9 (patch) | |
| tree | e80989c9ab858cdb78748406c048ec45171f9687 /ext/wddx | |
| parent | 0c6cd5f5f782879965dae93f2968985b007f4f32 (diff) | |
| download | php-git-37eee73274a34278bfc0c28101a571e001da9ad9.tar.gz | |
Support for encoding/decoding of private and protected members
Diffstat (limited to 'ext/wddx')
| -rw-r--r-- | ext/wddx/wddx.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index db1d14e0d8..2ccf58d435 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -522,7 +522,10 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj) continue; if (zend_hash_get_current_key_ex(HASH_OF(obj), &key, &key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) { - php_wddx_serialize_var(packet, *ent, key, key_len TSRMLS_CC); + char *class_name, *prop_name; + + zend_unmangle_property_name(key, &class_name, &prop_name); + php_wddx_serialize_var(packet, *ent, prop_name, strlen(prop_name)+1 TSRMLS_CC); } else { key_len = sprintf(tmp_buf, "%ld", idx); php_wddx_serialize_var(packet, *ent, tmp_buf, key_len TSRMLS_CC); @@ -972,6 +975,13 @@ static void php_wddx_pop_element(void *user_data, const XML_Char *name) /* Clean up class name var entry */ zval_ptr_dtor(&ent1->data); + } else if (Z_TYPE_P(ent2->data) == IS_OBJECT) { + zend_class_entry *old_scope = EG(scope); + + EG(scope) = Z_OBJCE_P(ent2->data); + ent1->data->refcount--; + add_property_zval(ent2->data, ent1->varname, ent1->data); + EG(scope) = old_scope; } else zend_hash_update(target_hash, ent1->varname, strlen(ent1->varname)+1, |