- fix property access

[m6w6/ext-http] / http_message_object.c

diff --git a/http_message_object.c b/http_message_object.c
index 108848be08df66a9278158d5dea7e0c46b41634a..95029c6f49b2f481d70f7337b63018b3fae6857e 100644 (file)
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -47,6 +47,10 @@ HTTP_BEGIN_ARGS(fromString, 1, 1)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getBody, 0);
+HTTP_BEGIN_ARGS(setBody, 0, 1)
+       HTTP_ARG_VAL(body, 0)
+HTTP_END_ARGS;
+
 HTTP_EMPTY_ARGS(getHeaders, 0);
 HTTP_BEGIN_ARGS(setHeaders, 0, 1)
        HTTP_ARG_VAL(headers, 0)
@@ -103,6 +107,7 @@ zend_class_entry *http_message_object_ce;
 zend_function_entry http_message_object_fe[] = {
        HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
        HTTP_MESSAGE_ME(getBody, ZEND_ACC_PUBLIC)
+       HTTP_MESSAGE_ME(setBody, ZEND_ACC_PUBLIC)
        HTTP_MESSAGE_ME(getHeaders, ZEND_ACC_PUBLIC)
        HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC)
        HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC)
@@ -123,7 +128,8 @@ zend_function_entry http_message_object_fe[] = {
        ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, toString), ZEND_ACC_PUBLIC)
 
        HTTP_MESSAGE_ME(fromString, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-       {NULL, NULL, NULL}
+       
+       EMPTY_FUNCTION_ENTRY
 };
 static zend_object_handlers http_message_object_handlers;
 
@@ -183,9 +189,11 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D)
 {
        zend_class_entry *ce = http_message_object_ce;
 
-       DCL_CONST(long, "NONE", HTTP_MSG_NONE);
-       DCL_CONST(long, "REQUEST", HTTP_MSG_REQUEST);
-       DCL_CONST(long, "RESPONSE", HTTP_MSG_RESPONSE);
+#ifndef WONKY
+       DCL_CONST(long, "TYPE_NONE", HTTP_MSG_NONE);
+       DCL_CONST(long, "TYPE_REQUEST", HTTP_MSG_REQUEST);
+       DCL_CONST(long, "TYPE_RESPONSE", HTTP_MSG_RESPONSE);
+#endif
 
        DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
        DCL_PROP(PROTECTED, string, body, "");
@@ -223,6 +231,11 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
        getObjectEx(http_message_object, obj, object);
        http_message *msg = obj->message;
        zval *return_value;
+       zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
+       
+       if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) {
+               return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+       }
 
        return_value = &EG(uninitialized_zval);
        return_value->refcount = 0;
@@ -231,12 +244,8 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 #if 0
        fprintf(stderr, "Read HttpMessage::$%s\n", Z_STRVAL_P(member));
 #endif
-       if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
-               zend_error(HE_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
-               return EG(uninitialized_zval_ptr);
-       }
 
-       switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
+       switch (pinfo->h)
        {
                case HTTP_MSG_PROPHASH_TYPE:
                        RETVAL_LONG(msg->type);
@@ -318,15 +327,18 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 {
        getObjectEx(http_message_object, obj, object);
        http_message *msg = obj->message;
+       zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
+       
+       if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) {
+               zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
+               return;
+       }
 
 #if 0
        fprintf(stderr, "Write HttpMessage::$%s\n", Z_STRVAL_P(member));
 #endif
-       if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
-               zend_error(HE_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
-       }
 
-       switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
+       switch (pinfo->h)
        {
                case HTTP_MSG_PROPHASH_TYPE:
                        convert_to_long_ex(&value);
@@ -401,7 +413,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
                zval array; \
                char *m_prop_name; \
                int m_prop_len; \
-               Z_ARRVAL(array) = OBJ_PROP(obj); \
+               INIT_ZARR(array, OBJ_PROP(obj)); \
                zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \
                add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+4, val); \
        }
@@ -411,12 +423,12 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
                zval array; \
                char *m_prop_name; \
                int m_prop_len; \
-               Z_ARRVAL(array) = OBJ_PROP(obj); \
+               INIT_ZARR(array, OBJ_PROP(obj)); \
                zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \
                add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, 1); \
        }
 
-       zend_hash_clean(OBJ_PROP(obj));
+       //zend_hash_clean(OBJ_PROP(obj));
 
        ASSOC_PROP(obj, long, "type", msg->type);
        ASSOC_PROP(obj, double, "httpVersion", msg->http.version);
@@ -519,6 +531,24 @@ PHP_METHOD(HttpMessage, getBody)
 }
 /* }}} */
 
+/* {{{ proto void HttpMessage::setBody(string body)
+ *
+ * Set the body of the HttpMessage.
+ * NOTE: Don't forget to update any headers accordingly.
+ */
+PHP_METHOD(HttpMessage, setBody)
+{
+       char *body;
+       int len;
+       getObject(http_message_object, obj);
+       
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &body, &len)) {
+               phpstr_dtor(PHPSTR(obj->message));
+               phpstr_from_string_ex(PHPSTR(obj->message), body, len);         
+       }
+}
+/* }}} */
+
 /* {{{ proto array HttpMessage::getHeaders()
  *
  * Get Message Headers.
@@ -531,7 +561,7 @@ PHP_METHOD(HttpMessage, getHeaders)
                zval headers;
                getObject(http_message_object, obj);
 
-               Z_ARRVAL(headers) = &obj->message->hdrs;
+               INIT_ZARR(headers, &obj->message->hdrs);
                array_init(return_value);
                array_copy(&headers, return_value);
        }
@@ -552,7 +582,7 @@ PHP_METHOD(HttpMessage, setHeaders)
        }
 
        zend_hash_clean(&obj->message->hdrs);
-       Z_ARRVAL(old_headers) = &obj->message->hdrs;
+       INIT_ZARR(old_headers, &obj->message->hdrs);
        array_copy(new_headers, &old_headers);
 }
 /* }}} */
@@ -571,7 +601,7 @@ PHP_METHOD(HttpMessage, addHeaders)
                return;
        }
 
-       Z_ARRVAL(old_headers) = &obj->message->hdrs;
+       INIT_ZARR(old_headers, &obj->message->hdrs);
        if (append) {
                array_append(new_headers, &old_headers);
        } else {
@@ -776,7 +806,6 @@ PHP_METHOD(HttpMessage, getHttpVersion)
 
        IF_RETVAL_USED {
                char ver[4] = {0};
-               double version;
                getObject(http_message_object, obj);
 
                sprintf(ver, "%1.1lf", obj->message->http.version);
@@ -846,7 +875,7 @@ PHP_METHOD(HttpMessage, send)
 }
 /* }}} */
 
-/* {{{ proto string HttpMessage::toString([bool include_parent = true])
+/* {{{ proto string HttpMessage::toString([bool include_parent = false])
  *
  * Get the string representation of the Message.
  */
@@ -855,7 +884,7 @@ PHP_METHOD(HttpMessage, toString)
        IF_RETVAL_USED {
                char *string;
                size_t length;
-               zend_bool include_parent = 1;
+               zend_bool include_parent = 0;
                getObject(http_message_object, obj);
 
                if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &include_parent)) {