diff options
| author | Anatol Belski <ab@php.net> | 2014-12-15 13:57:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-15 13:57:43 +0100 |
| commit | f62ad3bc578eb7a5494b7816f31dc31227483aed (patch) | |
| tree | bd0302ba9597655058c1526cfed29cba1df83601 /Zend/zend_objects.c | |
| parent | dba27372ec59af3f0ecc02b264b9c3a620b1a5bf (diff) | |
| parent | 178363cbff9cc2366b75eb11fd61473da238f7c6 (diff) | |
| download | php-git-f62ad3bc578eb7a5494b7816f31dc31227483aed.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
made the apache ini holders to be zend_bool
Removed useless local variable
Use simpler functions
Fixed test
small fixes to UPGRADING
Reorder to save alignment size (of course, only for common used structs)
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index c42354fe4e..76f923e977 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -167,9 +167,9 @@ ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object *o zval_add_ref(&new_prop); } if (key) { - zend_hash_update(new_object->properties, key, &new_prop); + zend_hash_add_new(new_object->properties, key, &new_prop); } else { - zend_hash_index_update(new_object->properties, num_key, &new_prop); + zend_hash_index_add_new(new_object->properties, num_key, &new_prop); } } ZEND_HASH_FOREACH_END(); } |