X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=b7d8261752b675d8166bbe8ba78bbc49d82f367d;hp=23974c3c48c2146a687541f308051ee81c61e61e;hb=addc97f0d58f4234080f520703c11b1d24940d3a;hpb=b045ad02a109f508cda8971667f75347ff63cfa1 diff --git a/http_message_object.c b/http_message_object.c index 23974c3..b7d8261 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -515,8 +515,8 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message #ifdef ZEND_ENGINE_2_4 - zend_object_std_init(OBJ_PROP(o), ce TSRMLS_CC); - object_properties_init(OBJ_PROP(o), ce); + 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); @@ -623,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) \ @@ -687,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 ### */