X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_message_object.c;h=ffc81ec61d773b9ecee9950c5dc33ba8d7a30c8d;hb=b0c335e3addb18b3b2c09a8a2cbd2bce95152703;hp=d588192e2fc0e8e523eba35c1297f32f6a2090ff;hpb=dd579c42c06ebfe26ea2ff8ee6106a22d27e3340;p=m6w6%2Fext-http

diff --git a/http_message_object.c b/http_message_object.c
index d588192..ffc81ec 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -133,7 +133,7 @@ zend_function_entry http_message_object_fe[] = {
 };
 static zend_object_handlers http_message_object_handlers;
 
-void _http_message_object_init(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(http_message_object)
 {
 	HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0);
 
@@ -146,6 +146,8 @@ void _http_message_object_init(INIT_FUNC_ARGS)
 	http_message_object_handlers.write_property = http_message_object_write_prop;
 	http_message_object_handlers.get_properties = http_message_object_get_props;
 	http_message_object_handlers.get_property_ptr_ptr = NULL;
+	
+	return SUCCESS;
 }
 
 zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC)
@@ -372,13 +374,15 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		break;
 
 		case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
-			if (msg->parent) {
-				zval tmp;
-				tmp.value.obj = obj->parent;
-				zend_objects_store_del_ref(&tmp TSRMLS_CC);
+			if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), http_message_object_ce TSRMLS_CC)) {
+				if (msg->parent) {
+					zval tmp;
+					tmp.value.obj = obj->parent;
+					Z_OBJ_DELREF(tmp);
+				}
+				Z_OBJ_ADDREF_P(value);
+				obj->parent = value->value.obj;
 			}
-			zend_objects_store_add_ref(value TSRMLS_CC);
-			obj->parent = value->value.obj;
 		break;
 
 		case HTTP_MSG_PROPHASH_REQUEST_METHOD: