X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_message_object.c;h=1db34f8e16cc19605e681290568e6df94e650fb3;hb=cc85d45513bc32669f3ed26601f80ce7d27eb3a1;hp=336d2504a8b14ad7c4d01cbca8cd72c06e5122f3;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c;p=m6w6%2Fext-http

diff --git a/http_message_object.c b/http_message_object.c
index 336d250..1db34f8 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -97,8 +97,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC);
 #define http_message_object_get_props _http_message_object_get_props
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
-#define http_message_object_clone_obj _http_message_object_clone_obj
-static inline zend_object_value _http_message_object_clone_obj(zval *object TSRMLS_DC);
 
 zend_class_entry *http_message_object_ce;
 zend_function_entry http_message_object_fe[] = {
@@ -138,7 +136,7 @@ PHP_MINIT_FUNCTION(http_message_object)
 	HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST);
 	HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE);
 
-	http_message_object_handlers.clone_obj = http_message_object_clone_obj;
+	http_message_object_handlers.clone_obj = _http_message_object_clone_obj;
 	http_message_object_handlers.read_property = http_message_object_read_prop;
 	http_message_object_handlers.write_property = http_message_object_write_prop;
 	http_message_object_handlers.get_properties = http_message_object_get_props;
@@ -149,21 +147,25 @@ PHP_MINIT_FUNCTION(http_message_object)
 
 zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC)
 {
-	return http_message_object_new_ex(ce, NULL);
+	return http_message_object_new_ex(ce, NULL, NULL);
 }
 
-zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg TSRMLS_DC)
+zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg, http_message_object **ptr TSRMLS_DC)
 {
 	zend_object_value ov;
 	http_message_object *o;
 
 	o = ecalloc(1, sizeof(http_message_object));
 	o->zo.ce = ce;
+	
+	if (ptr) {
+		*ptr = o;
+	}
 
 	if (msg) {
 		o->message = msg;
 		if (msg->parent) {
-			o->parent = http_message_object_from_msg(msg->parent);
+			o->parent = http_message_object_new_ex(ce, msg->parent, NULL);
 		}
 	}
 
@@ -176,9 +178,10 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
 	return ov;
 }
 
-zend_object_value _http_message_object_clone(zval *this_ptr TSRMLS_DC)
+zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC)
 {
-	return http_message_object_clone_obj(this_ptr TSRMLS_CC);
+	getObject(http_message_object, obj);
+	return http_message_object_new_ex(Z_OBJCE_P(this_ptr), http_message_dup(obj->message), NULL);
 }
 
 static inline void _http_message_object_declare_default_properties(TSRMLS_D)
@@ -216,12 +219,6 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
 	efree(o);
 }
 
-static inline zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC)
-{
-	getObject(http_message_object, obj);
-	return http_message_object_from_msg(http_message_dup(obj->message));
-}
-
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
 {
 	getObjectEx(http_message_object, obj, object);
@@ -506,7 +503,7 @@ PHP_METHOD(HttpMessage, __construct)
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &length) && message && length) {
 		if (obj->message = http_message_parse(message, length)) {
 			if (obj->message->parent) {
-				obj->parent = http_message_object_from_msg(obj->message->parent);
+				obj->parent = http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL);
 			}
 		}
 	} else if (!obj->message) {
@@ -539,7 +536,7 @@ PHP_METHOD(HttpMessage, fromString)
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) {
 		if (msg = http_message_parse(string, length)) {
 			Z_TYPE_P(return_value) = IS_OBJECT;
-			return_value->value.obj = http_message_object_from_msg(msg);
+			return_value->value.obj = http_message_object_new_ex(http_message_object_ce, msg, NULL);
 		}
 	}
 	SET_EH_NORMAL();