#define http_message_object_write_prop _http_message_object_write_prop
static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC);
#define http_message_object_get_prop_ptr _http_message_object_get_prop_ptr
-static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_LITERAL_KEY_DC TSRMLS_DC);
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_GET_PPTR_TYPE_DC ZEND_LITERAL_KEY_DC TSRMLS_DC);
#define http_message_object_get_props _http_message_object_get_props
static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
}
}
-#if PHP_VERSION_ID < 50399
+
+#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 *));
-#else
- zend_object_std_init(&o->zo, ce TSRMLS_CC);
- object_properties_init(&o->zo, ce);
#endif
ov.handle = putObject(http_message_object, o);
freeObject(o);
}
-static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_LITERAL_KEY_DC TSRMLS_DC) {
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_GET_PPTR_TYPE_DC ZEND_LITERAL_KEY_DC TSRMLS_DC) {
getObjectEx(http_message_object, obj, object);
http_message_object_prophandler *handler;
return NULL;
}
- return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member ZEND_LITERAL_KEY_CC TSRMLS_CC);
+ return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member ZEND_GET_PPTR_TYPE_CC ZEND_LITERAL_KEY_CC TSRMLS_CC);
}
static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC)
{
getObjectEx(http_message_object, obj, object);
http_message_object_prophandler *handler;
- zval *return_value, *tmp_member = NULL;
-
- if (Z_TYPE_P(member) != IS_STRING) {
- ALLOC_ZVAL(tmp_member);
- MAKE_COPY_ZVAL(&member, tmp_member);
- convert_to_string(tmp_member);
- member = tmp_member;
-#if PHP_VERSION_ID >= 50399
- _zend_literal_key = NULL;
-#endif
- }
+ zval *return_value;
if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) {
if (type == BP_VAR_W) {
zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
- if (tmp_member) {
- zval_ptr_dtor(&tmp_member);
- }
return NULL;
}
return_value = zend_get_std_object_handlers()->read_property(object, member, type ZEND_LITERAL_KEY_CC TSRMLS_CC);
}
- if (tmp_member) {
- zval_ptr_dtor(&tmp_member);
- }
return return_value;
}
{
getObjectEx(http_message_object, obj, object);
http_message_object_prophandler *handler;
- zval *tmp_member = NULL;
-
- if (Z_TYPE_P(member) != IS_STRING) {
- ALLOC_ZVAL(tmp_member);
- MAKE_COPY_ZVAL(&member, tmp_member);
- convert_to_string(tmp_member);
- member = tmp_member;
-#if PHP_VERSION_ID >= 50399
- _zend_literal_key = NULL;
-#endif
- }
if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) {
handler->write(obj, value TSRMLS_CC);
} else {
zend_get_std_object_handlers()->write_property(object, member, value ZEND_LITERAL_KEY_CC TSRMLS_CC);
}
- if (tmp_member) {
- zval_ptr_dtor(&tmp_member);
- }
}
static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
zval *headers;
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
-#if PHP_VERSION_ID < 50399
- 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 = zend_std_get_properties(object TSRMLS_CC);
+ HashTable *props = OBJ_PROP(obj);
#endif
- zval array, *parent;
-
INIT_ZARR(array, props);
#define ASSOC_PROP(array, ptype, name, val) \
}
ASSOC_PROP(array, zval, "parentMessage", parent);
- return OBJ_PROP(obj);
+ return props;
}
/* ### USERLAND ### */
HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE);
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) {
RETURN_FALSE;
}
STR_SET(obj->message->http.info.response.status, estrndup(status, status_len));