X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=b7d8261752b675d8166bbe8ba78bbc49d82f367d;hp=e7a564f2ba58349720d4a8a2336fb40e3e39091d;hb=11e10af01b2125c59f7a91cee615c2431a1b7196;hpb=e97eb4951a19e934d25e9c5c2f147f4b009bbdfe diff --git a/http_message_object.c b/http_message_object.c index e7a564f..b7d8261 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -513,9 +513,15 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message } } + +#ifdef ZEND_ENGINE_2_4 + zend_object_std_init(o, ce TSRMLS_CC); + object_properties_init(o, ce); +#else ALLOC_HASHTABLE(OBJ_PROP(o)); 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 *)); +#endif ov.handle = putObject(http_message_object, o); ov.handlers = &http_message_object_handlers; @@ -617,9 +623,12 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) zval *headers; getObjectEx(http_message_object, obj, object); http_message *msg = obj->message; - HashTable *props = OBJ_PROP(obj); zval array, *parent; - +#ifdef ZEND_ENGINE_2_4 + HashTable *props = zend_get_std_object_handlers()->get_properties(object TSRMLS_CC); +#else + HashTable *props = OBJ_PROP(obj); +#endif INIT_ZARR(array, props); #define ASSOC_PROP(array, ptype, name, val) \ @@ -681,7 +690,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) } ASSOC_PROP(array, zval, "parentMessage", parent); - return OBJ_PROP(obj); + return props; } /* ### USERLAND ### */