- ditch HttpMessage::__construct() and ::setRaw

[m6w6/ext-http] / http_message_object.c

diff --git a/http_message_object.c b/http_message_object.c
index 0f72351450fd6d494ef83effaa2942134a3e5a97..244e29da292569359834051902169c13548f51e3 100644 (file)
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -39,8 +39,6 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
 
 zend_class_entry *http_message_object_ce;
 zend_function_entry http_message_object_fe[] = {
-       PHP_ME(HttpMessage, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-       PHP_ME(HttpMessage, setRaw, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpMessage, getBody, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpMessage, getHeaders, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpMessage, setHeaders, NULL, ZEND_ACC_PUBLIC)
@@ -89,7 +87,18 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
 
        o = ecalloc(1, sizeof(http_message_object));
        o->zo.ce = ce;
-       o->message = msg ? msg : http_message_new();
+       
+       MAKE_STD_ZVAL(o->nested);
+       Z_TYPE_P(o->nested) = IS_OBJECT;
+
+       if (msg) {
+               o->message = msg;
+               if (msg->nested) {
+                       o->nested->value.obj = http_message_object_from_msg(msg->nested);
+               }
+       } else {
+               o->message = http_message_new();
+       }
 
        ALLOC_HASHTABLE(OBJ_PROP(o));
        zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
@@ -106,7 +115,6 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D)
 
        DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
 
-       DCL_PROP(PROTECTED, string, raw, "");
        DCL_PROP(PROTECTED, string, body, "");
 
        DCL_PROP(PROTECTED, string, requestMethod, "");
@@ -115,7 +123,8 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D)
 
        DCL_PROP_N(PROTECTED, httpVersion);
        DCL_PROP_N(PROTECTED, headers);
-       DCL_PROP_N(PROTECTED, nestedMessage);
+       
+       DCL_PROP_N(PUBLIC, nestedMessage);
 }
 
 static void _http_message_object_free(zend_object *object TSRMLS_DC)
@@ -127,8 +136,10 @@ static void _http_message_object_free(zend_object *object TSRMLS_DC)
                FREE_HASHTABLE(OBJ_PROP(o));
        }
        if (o->message) {
-               http_message_free(o->message);
+               http_message_dtor(o->message);
+               efree(o->message);
        }
+       FREE_ZVAL(o->nested);
        zval_dtor(&o->_tmp_property);
        efree(o);
 }
@@ -139,9 +150,12 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
        http_message *msg = obj->message;
        zval *return_value = &obj->_tmp_property;
 
-       if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
-               zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
-               return EG(uninitialized_zval_ptr);
+       /* public */
+       if (strcmp(Z_STRVAL_P(member), "nestedMessage")) {
+               if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
+                       zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
+                       return EG(uninitialized_zval_ptr);
+               }
        }
 
     zval_dtor(return_value);
@@ -175,18 +189,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
                        }
                break;
 
-               case HTTP_MSG_PROPHASH_RAW:
-                       if (msg->raw) {
-                               if (msg->len) {
-                                       RETVAL_STRINGL(msg->raw, msg->len, 1);
-                               } else {
-                                       RETVAL_STRINGL("", 0, 1);
-                               }
-                       } else {
-                               RETVAL_NULL();
-                       }
-               break;
-
                case HTTP_MSG_PROPHASH_BODY:
                        phpstr_fix(PHPSTR(msg));
                        RETVAL_PHPSTR(PHPSTR(msg), 0, 1);
@@ -199,6 +201,9 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 
                case HTTP_MSG_PROPHASH_NESTED_MESSAGE:
                        RETVAL_NULL();
+                       if (msg->nested) {
+                               return obj->nested;
+                       }
                break;
 
                case HTTP_MSG_PROPHASH_REQUEST_METHOD:
@@ -238,8 +243,11 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
        getObjectEx(http_message_object, obj, object);
        http_message *msg = obj->message;
 
-       if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
-               zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
+       /* public */
+       if (strcmp("nestedMessage", Z_STRVAL_P(member))) {
+               if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
+                       zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
+               }
        }
 
 #if 0
@@ -266,7 +274,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
                                        msg->info.request.URI = NULL;
                                }
                        }
-                       
+
                break;
 
                case HTTP_MSG_PROPHASH_HTTP_VERSION:
@@ -282,11 +290,6 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
                        }
                break;
 
-               case HTTP_MSG_PROPHASH_RAW:
-                       http_message_dtor(msg);
-                       http_message_parse_ex(msg, Z_STRVAL_P(value), Z_STRLEN_P(value), 1);
-               break;
-
                case HTTP_MSG_PROPHASH_BODY:
                        phpstr_dtor(PHPSTR(msg));
                        phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(value), Z_STRLEN_P(value));
@@ -298,6 +301,9 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
                break;
 
                case HTTP_MSG_PROPHASH_NESTED_MESSAGE:
+                       zval_ptr_dtor(&obj->nested);
+                       obj->nested->value.obj = value->value.obj;
+                       zval_add_ref(&value);
                break;
 
                case HTTP_MSG_PROPHASH_REQUEST_METHOD:
@@ -324,6 +330,8 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
                        }
                break;
        }
+       zval_dtor(value);
+       FREE_ZVAL(value);
 }
 
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
@@ -355,7 +363,6 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
        zend_hash_clean(OBJ_PROP(obj));
 
        ASSOC_PROP(obj, long, "type", msg->type);
-       ASSOC_STRINGL(obj, "raw", msg->raw, msg->len)
        ASSOC_STRINGL(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
 
        MAKE_STD_ZVAL(headers);