X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=f1a6705cdccea600e1ccb1473fcf9fc272a06ebb;hp=fee935ededa29330dc0378e8f6b5112c3d97d52a;hb=16ea91ddd08d15dd9b7206229fec6158f212adaf;hpb=d9977f6aacc9e424366bc80d6d252f45e23bdc0f

diff --git a/http_message_object.c b/http_message_object.c
index fee935e..f1a6705 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -26,6 +26,8 @@
 #include "php_http_std_defs.h"
 #include "php_http_message_object.h"
 
+#include "phpstr/phpstr.h"
+
 #ifdef ZEND_ENGINE_2
 
 #define http_message_object_declare_default_properties() _http_message_object_declare_default_properties(TSRMLS_C)
@@ -40,7 +42,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)
@@ -55,6 +56,8 @@ zend_function_entry http_message_object_fe[] = {
 	PHP_ME(HttpMessage, setRequestUri, NULL, ZEND_ACC_PUBLIC)
 	PHP_ME(HttpMessage, getHttpVersion, NULL, ZEND_ACC_PUBLIC)
 	PHP_ME(HttpMessage, setHttpVersion, NULL, ZEND_ACC_PUBLIC)
+	PHP_ME(HttpMessage, getParentMessage, NULL, ZEND_ACC_PUBLIC)
+	PHP_ME(HttpMessage, send, NULL, ZEND_ACC_PUBLIC)
 	PHP_ME(HttpMessage, toString, NULL, ZEND_ACC_PUBLIC)
 
 	ZEND_MALIAS(HttpMessage, __toString, toString, NULL, ZEND_ACC_PUBLIC)
@@ -89,7 +92,16 @@ 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();
+	o->message = NULL;
+	o->parent.handle = 0;
+	o->parent.handlers = NULL;
+
+	if (msg) {
+		o->message = msg;
+		if (msg->parent) {
+			o->parent = http_message_object_from_msg(msg->parent);
+		}
+	}
 
 	ALLOC_HASHTABLE(OBJ_PROP(o));
 	zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
@@ -105,20 +117,16 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D)
 	zend_class_entry *ce = http_message_object_ce;
 
 	DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
-
-	DCL_PROP(PROTECTED, string, raw, "");
 	DCL_PROP(PROTECTED, string, body, "");
-
 	DCL_PROP(PROTECTED, string, requestMethod, "");
 	DCL_PROP(PROTECTED, string, requestUri, "");
 	DCL_PROP(PROTECTED, long, responseCode, 0);
-
 	DCL_PROP_N(PROTECTED, httpVersion);
 	DCL_PROP_N(PROTECTED, headers);
-	DCL_PROP_N(PROTECTED, nestedMessage);
+	DCL_PROP_N(PROTECTED, parentMessage);
 }
 
-static void _http_message_object_free(zend_object *object TSRMLS_DC)
+void _http_message_object_free(zend_object *object TSRMLS_DC)
 {
 	http_message_object *o = (http_message_object *) object;
 
@@ -127,9 +135,9 @@ 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);
 	}
-	zval_dtor(&o->_tmp_property);
 	efree(o);
 }
 
@@ -137,22 +145,18 @@ 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 = &obj->_tmp_property;
+	zval *return_value;
+
+	/* tmp var */
+	ALLOC_ZVAL(return_value);
+	return_value->refcount = 0;
 
 	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);
-
-#if 0
-	fprintf(stderr, "Reading property: %s(%d==%d) (%lu)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member)),
-		zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1)
-	);
-#endif
-
-	switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1))
+	switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
 	{
 		case HTTP_MSG_PROPHASH_TYPE:
 			RETVAL_LONG(msg->type);
@@ -161,10 +165,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 		case HTTP_MSG_PROPHASH_HTTP_VERSION:
 			switch (msg->type)
 			{
-				case HTTP_MSG_NONE:
-					RETVAL_NULL();
-				break;
-
 				case HTTP_MSG_REQUEST:
 					RETVAL_DOUBLE(msg->info.request.http_version);
 				break;
@@ -172,18 +172,11 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 				case HTTP_MSG_RESPONSE:
 					RETVAL_DOUBLE(msg->info.response.http_version);
 				break;
-			}
-		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();
+				case HTTP_MSG_NONE:
+				default:
+					RETVAL_NULL();
+				break;
 			}
 		break;
 
@@ -197,12 +190,19 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 			zend_hash_copy(Z_ARRVAL_P(return_value), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 		break;
 
-		case HTTP_MSG_PROPHASH_NESTED_MESSAGE:
-			RETVAL_NULL();
+		case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
+			if (msg->parent) {
+				RETVAL_OBJVAL(obj->parent);
+				Z_TYPE_P(return_value)	= IS_OBJECT;
+				return_value->value.obj	= obj->parent;
+				zend_objects_store_add_ref(return_value TSRMLS_CC);
+			} else {
+				RETVAL_NULL();
+			}
 		break;
 
 		case HTTP_MSG_PROPHASH_REQUEST_METHOD:
-			if (msg->type == HTTP_MSG_REQUEST && msg->info.request.method) {
+			if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.method) {
 				RETVAL_STRING(msg->info.request.method, 1);
 			} else {
 				RETVAL_NULL();
@@ -210,7 +210,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 		break;
 
 		case HTTP_MSG_PROPHASH_REQUEST_URI:
-			if (msg->type == HTTP_MSG_REQUEST && msg->info.request.URI) {
+			if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.URI) {
 				RETVAL_STRING(msg->info.request.URI, 1);
 			} else {
 				RETVAL_NULL();
@@ -218,7 +218,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 		break;
 
 		case HTTP_MSG_PROPHASH_RESPONSE_CODE:
-			if (msg->type == HTTP_MSG_RESPONSE) {
+			if (HTTP_MSG_TYPE(RESPONSE, msg)) {
 				RETVAL_LONG(msg->info.response.code);
 			} else {
 				RETVAL_NULL();
@@ -242,17 +242,12 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
 	}
 
-#if 0
-	fprintf(stderr, "Writing property: %s(%d==%d) (%lu)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member)),
-		zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1)
-	);
-#endif
-
-	switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1))
+	switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
 	{
 		case HTTP_MSG_PROPHASH_TYPE:
+			convert_to_long_ex(&value);
 			if (Z_LVAL_P(value) != msg->type) {
-				if (msg->type == HTTP_MSG_REQUEST) {
+				if (HTTP_MSG_TYPE(REQUEST, msg)) {
 					if (msg->info.request.method) {
 						efree(msg->info.request.method);
 					}
@@ -261,7 +256,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 					}
 				}
 				msg->type = Z_LVAL_P(value);
-				if (msg->type == HTTP_MSG_REQUEST) {
+				if (HTTP_MSG_TYPE(REQUEST, msg)) {
 					msg->info.request.method = NULL;
 					msg->info.request.URI = NULL;
 				}
@@ -270,6 +265,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		break;
 
 		case HTTP_MSG_PROPHASH_HTTP_VERSION:
+			convert_to_double_ex(&value);
 			switch (msg->type)
 			{
 				case HTTP_MSG_REQUEST:
@@ -282,26 +278,31 @@ 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:
+			convert_to_string_ex(&value);
 			phpstr_dtor(PHPSTR(msg));
 			phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(value), Z_STRLEN_P(value));
 		break;
 
 		case HTTP_MSG_PROPHASH_HEADERS:
+			convert_to_array_ex(&value);
 			zend_hash_clean(&msg->hdrs);
 			zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(value), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 		break;
 
-		case HTTP_MSG_PROPHASH_NESTED_MESSAGE:
+		case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
+			if (msg->parent) {
+				zval tmp;
+				tmp.value.obj = obj->parent;
+				zend_objects_store_del_ref(&tmp TSRMLS_CC);
+			}
+			zend_objects_store_add_ref(value TSRMLS_CC);
+			obj->parent = value->value.obj;
 		break;
 
 		case HTTP_MSG_PROPHASH_REQUEST_METHOD:
-			if (msg->type == HTTP_MSG_REQUEST) {
+			convert_to_string_ex(&value);
+			if (HTTP_MSG_TYPE(REQUEST, msg)) {
 				if (msg->info.request.method) {
 					efree(msg->info.request.method);
 				}
@@ -310,7 +311,8 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		break;
 
 		case HTTP_MSG_PROPHASH_REQUEST_URI:
-			if (msg->type == HTTP_MSG_REQUEST) {
+			convert_to_string_ex(&value);
+			if (HTTP_MSG_TYPE(REQUEST, msg)) {
 				if (msg->info.request.URI) {
 					efree(msg->info.request.URI);
 				}
@@ -319,13 +321,12 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		break;
 
 		case HTTP_MSG_PROPHASH_RESPONSE_CODE:
-			if (msg->type == HTTP_MSG_RESPONSE) {
+			convert_to_long_ex(&value);
+			if (HTTP_MSG_TYPE(RESPONSE, msg)) {
 				msg->info.response.code = Z_LVAL_P(value);
 			}
 		break;
 	}
-	zval_dtor(value);
-	FREE_ZVAL(value);
 }
 
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
@@ -357,7 +358,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);