- use object_handlers->add_ref()

[m6w6/ext-http] / http_message_object.c

diff --git a/http_message_object.c b/http_message_object.c
index 759c75a94f8cfee7ea7b06487d766f1a62fd0d6a..ffc81ec61d773b9ecee9950c5dc33ba8d7a30c8d 100644 (file)
--- 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:
@@ -702,12 +706,7 @@ PHP_METHOD(HttpMessage, getResponseCode)
 
        IF_RETVAL_USED {
                getObject(http_message_object, obj);
-
-               if (!HTTP_MSG_TYPE(RESPONSE, obj->message)) {
-                       http_error(HE_NOTICE, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_RESPONSE");
-                       RETURN_FALSE;
-               }
-
+               HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE);
                RETURN_LONG(obj->message->http.info.response.code);
        }
 }
@@ -727,10 +726,7 @@ PHP_METHOD(HttpMessage, setResponseCode)
        long code;
        getObject(http_message_object, obj);
 
-       if (!HTTP_MSG_TYPE(RESPONSE, obj->message)) {
-               http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_RESPONSE");
-               RETURN_FALSE;
-       }
+       HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE);
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
                RETURN_FALSE;
@@ -758,12 +754,7 @@ PHP_METHOD(HttpMessage, getRequestMethod)
 
        IF_RETVAL_USED {
                getObject(http_message_object, obj);
-
-               if (!HTTP_MSG_TYPE(REQUEST, obj->message)) {
-                       http_error(HE_NOTICE, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_REQUEST");
-                       RETURN_FALSE;
-               }
-
+               HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE);
                RETURN_STRING(obj->message->http.info.request.method, 1);
        }
 }
@@ -784,10 +775,7 @@ PHP_METHOD(HttpMessage, setRequestMethod)
        int method_len;
        getObject(http_message_object, obj);
 
-       if (!HTTP_MSG_TYPE(REQUEST, obj->message)) {
-               http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_REQUEST");
-               RETURN_FALSE;
-       }
+       HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE);
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) {
                RETURN_FALSE;
@@ -819,12 +807,7 @@ PHP_METHOD(HttpMessage, getRequestUri)
 
        IF_RETVAL_USED {
                getObject(http_message_object, obj);
-
-               if (!HTTP_MSG_TYPE(REQUEST, obj->message)) {
-                       http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_REQUEST");
-                       RETURN_FALSE;
-               }
-
+               HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE);
                RETURN_STRING(obj->message->http.info.request.URI, 1);
        }
 }
@@ -845,13 +828,10 @@ PHP_METHOD(HttpMessage, setRequestUri)
        int URIlen;
        getObject(http_message_object, obj);
 
-       if (!HTTP_MSG_TYPE(REQUEST, obj->message)) {
-               http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_REQUEST");
-               RETURN_FALSE;
-       }
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URI, &URIlen)) {
                RETURN_FALSE;
        }
+       HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE);
        if (URIlen < 1) {
                http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Cannot set HttpMessage::requestUri to an empty string");
                RETURN_FALSE;