X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=3129193147c2404e8bb66d804f2dd43c292d5e78;hp=8d1e8470678c55ce4eb3266d5df2b5adae697759;hb=7e20868975f5c23ccd74af0d8f7147c506d2b8cf;hpb=8fb7d5e06e0fb4252831ecb5a3b87d0279363119

diff --git a/http_message_object.c b/http_message_object.c
index 8d1e847..3129193 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -146,11 +146,11 @@ HTTP_END_ARGS;
 HTTP_EMPTY_ARGS(reverse);
 
 #define http_message_object_read_prop _http_message_object_read_prop
-static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC);
+static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC);
 #define http_message_object_write_prop _http_message_object_write_prop
-static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC);
+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 TSRMLS_DC);
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member 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);
 
@@ -513,9 +513,14 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
 		}
 	}
 
+#if PHP_VERSION_ID < 50399
 	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);
 	ov.handlers = &http_message_object_handlers;
@@ -558,7 +563,7 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
 	freeObject(o);
 }
 
-static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC) {
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_LITERAL_KEY_DC TSRMLS_DC) {
 	getObjectEx(http_message_object, obj, object);
 	http_message_object_prophandler *handler;
 	
@@ -567,18 +572,31 @@ static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRML
 		return NULL;
 	}
 
-	return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
+	return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member ZEND_LITERAL_KEY_CC TSRMLS_CC);
 }
 
-static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
+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;
+	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
+	}
 
 	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;
 		}
 
@@ -594,21 +612,38 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 		handler->read(obj, return_value TSRMLS_CC);
 
 	} else {
-		return_value = zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+		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;
 }
 
-static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC)
+static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC)
 {
 	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 TSRMLS_CC);
+		zend_get_std_object_handlers()->write_property(object, member, value ZEND_LITERAL_KEY_CC TSRMLS_CC);
+	}
+	if (tmp_member) {
+		zval_ptr_dtor(&tmp_member);
 	}
 }
 
@@ -617,7 +652,11 @@ 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);
+#else
+	HashTable *props = zend_std_get_properties(object TSRMLS_CC);
+#endif
 	zval array, *parent;
 	
 	INIT_ZARR(array, props);