X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_deflatestream_object.c;h=9d99bc9aa239c9d371d520e70cb6b518d0116f15;hp=b535cf5aaca536575f421f7f45b486c643b78224;hb=d89b71ab769c6fe11e3efa87d9e93ae4448ecc00;hpb=c8dff7011092296f9fcc12e68ad8eef18b19cdf4 diff --git a/http_deflatestream_object.c b/http_deflatestream_object.c index b535cf5..9d99bc9 100644 --- a/http_deflatestream_object.c +++ b/http_deflatestream_object.c @@ -101,7 +101,8 @@ zend_object_value _http_deflatestream_object_new_ex(zend_class_entry *ce, http_e } ALLOC_HASHTABLE(OBJ_PROP(o)); - zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0); + zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); + zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); ov.handle = putObject(http_deflatestream_object, o); ov.handlers = &http_deflatestream_object_handlers; @@ -112,14 +113,19 @@ zend_object_value _http_deflatestream_object_new_ex(zend_class_entry *ce, http_e zend_object_value _http_deflatestream_object_clone_obj(zval *this_ptr TSRMLS_DC) { http_encoding_stream *s; - getObject(http_deflatestream_object, obj); + zend_object_value new_ov; + http_deflatestream_object *new_obj = NULL; + getObject(http_deflatestream_object, old_obj); s = ecalloc(1, sizeof(http_encoding_stream)); - s->flags = obj->stream->flags; - deflateCopy(&s->stream, &obj->stream->stream); + s->flags = old_obj->stream->flags; + deflateCopy(&s->stream, &old_obj->stream->stream); s->stream.opaque = phpstr_dup(s->stream.opaque); - return http_deflatestream_object_new_ex(Z_OBJCE_P(this_ptr), s, NULL); + new_ov = http_deflatestream_object_new_ex(old_obj->zo.ce, s, &new_obj); + zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + + return new_ov; } void _http_deflatestream_object_free(zend_object *object TSRMLS_DC)