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

diff --git a/http_message_object.c b/http_message_object.c
index 81f31a4..70bf7f0 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -393,6 +393,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);
@@ -522,7 +526,7 @@ 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
@@ -534,8 +538,6 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 	}
 #endif
 	
-	cpy = value;
-	
 #ifdef WONKY
 	switch (h)
 #else
@@ -544,26 +546,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 +586,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 +594,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 +602,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 +610,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 +619,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 +802,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 +1276,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 +1288,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