X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=121337bae962e0ad262a795a5448dda722b2057d;hp=81f31a409fdb9d46350e3707d3321f07302bbc82;hb=04491f8ea81849ecb509b96c480ffe6f00d0cfd4;hpb=c5f93282d7885a6c5f80863cbee2ab55a3176851

diff --git a/http_message_object.c b/http_message_object.c
index 81f31a4..121337b 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -149,6 +149,8 @@ HTTP_EMPTY_ARGS(reverse);
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC);
 #define http_message_object_write_prop _http_message_object_write_prop
 static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC);
+#define http_message_object_get_prop_ptr _http_message_object_get_prop_ptr
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC);
 #define http_message_object_get_props _http_message_object_get_props
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
 
@@ -228,7 +230,7 @@ PHP_MINIT_FUNCTION(http_message_object)
 	http_message_object_handlers.read_property = http_message_object_read_prop;
 	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;
+	http_message_object_handlers.get_property_ptr_ptr = http_message_object_get_prop_ptr;
 	
 	zend_declare_property_long(THIS_CE, ZEND_STRS("type")-1, HTTP_MSG_NONE, ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_string(THIS_CE, ZEND_STRS("body")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC);
@@ -393,6 +395,10 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
 {
 	http_message_object *o = (http_message_object *) object;
 
+	if (o->iterator) {
+		zval_ptr_dtor(&o->iterator);
+		o->iterator = NULL;
+	}
 	if (o->message) {
 		http_message_dtor(o->message);
 		efree(o->message);
@@ -408,6 +414,17 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
 	freeObject(o);
 }
 
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC) {
+	getObjectEx(http_message_object, obj, object);
+	zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
+	
+	if (!pinfo || pinfo->ce != http_message_object_ce) {
+		return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
+	}
+	zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
+	return NULL;
+}
+
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
 {
 	getObjectEx(http_message_object, obj, object);
@@ -418,7 +435,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 #else
 	zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
 	
-	if (!pinfo) {
+	if (!pinfo || pinfo->ce != http_message_object_ce) {
 		return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
 	}
 #endif
@@ -522,20 +539,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;
-	zval *cpy;
+	zval *cpy = NULL;
 #ifdef WONKY
 	ulong h = zend_hash_func(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1);
 #else
 	zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
 	
-	if (!pinfo) {
+	if (!pinfo || pinfo->ce != http_message_object_ce) {
 		zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
 		return;
 	}
 #endif
 	
-	cpy = value;
-	
 #ifdef WONKY
 	switch (h)
 #else
@@ -544,26 +559,26 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 	{
 		case HTTP_MSG_PROPHASH_TYPE:
 		case HTTP_MSG_CHILD_PROPHASH_TYPE:
-			convert_to_long_ex(&cpy);
+			cpy = http_zsep(IS_LONG, value);
 			http_message_set_type(msg, Z_LVAL_P(cpy));
 			break;
 
 		case HTTP_MSG_PROPHASH_HTTP_VERSION:
 		case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION:
-			convert_to_double_ex(&cpy);
+			cpy = http_zsep(IS_DOUBLE, value);
 			msg->http.version = Z_DVAL_P(cpy);
 			break;
 
 		case HTTP_MSG_PROPHASH_BODY:
 		case HTTP_MSG_CHILD_PROPHASH_BODY:
-			convert_to_string_ex(&cpy);
+			cpy = http_zsep(IS_STRING, value);
 			phpstr_dtor(PHPSTR(msg));
 			phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
 			break;
 
 		case HTTP_MSG_PROPHASH_HEADERS:
 		case HTTP_MSG_CHILD_PROPHASH_HEADERS:
-			convert_to_array_ex(&cpy);
+			cpy = http_zsep(IS_ARRAY, value);
 			zend_hash_clean(&msg->hdrs);
 			zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 			break;
@@ -584,7 +599,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		case HTTP_MSG_PROPHASH_REQUEST_METHOD:
 		case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD:
 			if (HTTP_MSG_TYPE(REQUEST, msg)) {
-				convert_to_string_ex(&cpy);
+				cpy = http_zsep(IS_STRING, value);
 				STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 			}
 			break;
@@ -592,7 +607,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		case HTTP_MSG_PROPHASH_REQUEST_URL:
 		case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL:
 			if (HTTP_MSG_TYPE(REQUEST, msg)) {
-				convert_to_string_ex(&cpy);
+				cpy = http_zsep(IS_STRING, value);
 				STR_SET(msg->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 			}
 			break;
@@ -600,7 +615,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		case HTTP_MSG_PROPHASH_RESPONSE_CODE:
 		case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE:
 			if (HTTP_MSG_TYPE(RESPONSE, msg)) {
-				convert_to_long_ex(&cpy);
+				cpy = http_zsep(IS_LONG, value);
 				msg->http.info.response.code = Z_LVAL_P(cpy);
 			}
 			break;
@@ -608,7 +623,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
 		case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS:
 			if (HTTP_MSG_TYPE(RESPONSE, msg)) {
-				convert_to_string_ex(&cpy);
+				cpy = http_zsep(IS_STRING, value);
 				STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 			}
 			break;
@@ -617,7 +632,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 			zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
 			break;
 	}
-	if (cpy != value) {
+	if (cpy) {
 		zval_ptr_dtor(&cpy);
 	}
 }
@@ -800,7 +815,7 @@ PHP_METHOD(HttpMessage, setBody)
 	
 	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);		
+		phpstr_from_string_ex(PHPSTR(obj->message), body, len);
 	}
 }
 /* }}} */
@@ -1274,6 +1289,7 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
 				zval_ptr_dtor(&array);
 				
 				if (PHPSTR_VAL(obj->message) && PHPSTR_LEN(obj->message)) {
+					phpstr_fix(PHPSTR(obj->message));
 					INIT_PZVAL(&body);
 					ZVAL_STRINGL(&body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message), 0);
 					if (method != HTTP_POST) {
@@ -1285,6 +1301,7 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
 						zval_copy_ctor(&body);
 						sapi_module.treat_data(PARSE_STRING, Z_STRVAL(body), &post TSRMLS_CC);
 						zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setpostfields", NULL, &post);
+						zval_dtor(&post);
 					}
 				}
 #else