X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=95029c6f49b2f481d70f7337b63018b3fae6857e;hp=a09c83b53be0e08d72fc3272ea13fda3660288c8;hb=e16550c0f9e13089c70aa1944d1a588f61fa81d2;hpb=61ced187b8a3a3c21578d253e37d1a076aa0aed4

diff --git a/http_message_object.c b/http_message_object.c
index a09c83b..95029c6 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -48,7 +48,7 @@ HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getBody, 0);
 HTTP_BEGIN_ARGS(setBody, 0, 1)
-	HTTP_ARG_VAL(body)
+	HTTP_ARG_VAL(body, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getHeaders, 0);
@@ -190,9 +190,9 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D)
 	zend_class_entry *ce = http_message_object_ce;
 
 #ifndef WONKY
-	DCL_CONST(long, "NONE", HTTP_MSG_NONE);
-	DCL_CONST(long, "REQUEST", HTTP_MSG_REQUEST);
-	DCL_CONST(long, "RESPONSE", HTTP_MSG_RESPONSE);
+	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);
@@ -231,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;
@@ -239,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(E_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);
@@ -326,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(E_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);
@@ -409,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); \
 	}
@@ -419,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);
@@ -557,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);
 	}
@@ -578,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);
 }
 /* }}} */
@@ -597,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 {
@@ -871,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.
  */
@@ -880,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)) {