X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=279e4ea02e97777d76feb1a820944bd9b9dd0f11;hp=ade26547982859fa4fa60acc2032edbdccca5fd6;hb=649aada485583ccac67928e0700cb5f1b963f4e8;hpb=7fef44c902c86eebce30f36003a27905fbaeba65

diff --git a/http_functions.c b/http_functions.c
index ade2654..279e4ea 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -1161,14 +1161,9 @@ PHP_FUNCTION(http_post_data)
 
 	RETVAL_FALSE;
 
-	body.type = HTTP_REQUEST_BODY_CSTRING;
-	body.data = postdata;
-	body.size = postdata_len;
-
 	http_request_init_ex(&request, NULL, HTTP_POST, URL);
-	request.body = &body;
+	request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, postdata, postdata_len, 0);
 	if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) {
-		request.body = NULL;
 		http_request_exec(&request);
 		if (info) {
 			http_request_info(&request, Z_ARRVAL_P(info));
@@ -1200,7 +1195,7 @@ PHP_FUNCTION(http_post_fields)
 		RETURN_FALSE;
 	}
 
-	if (SUCCESS != http_request_body_fill(&body, Z_ARRVAL_P(fields), files ? Z_ARRVAL_P(files) : NULL)) {
+	if (!http_request_body_fill(&body, Z_ARRVAL_P(fields), files ? Z_ARRVAL_P(files) : NULL)) {
 		RETURN_FALSE;
 	}
 
@@ -1214,15 +1209,12 @@ PHP_FUNCTION(http_post_fields)
 	http_request_init_ex(&request, NULL, HTTP_POST, URL);
 	request.body = &body;
 	if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) {
-		request.body = NULL;
 		http_request_exec(&request);
-		http_request_body_dtor(&body);
 		if (info) {
 			http_request_info(&request, Z_ARRVAL_P(info));
 		}
 		RETVAL_RESPONSE_OR_BODY(request);
 	}
-	http_request_body_dtor(&body);
 	http_request_dtor(&request);
 }
 /* }}} */
@@ -1272,15 +1264,14 @@ PHP_FUNCTION(http_put_file)
 	http_request_init_ex(&request, NULL, HTTP_PUT, URL);
 	request.body = &body;
 	if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) {
-		request.body = NULL;
 		http_request_exec(&request);
-		http_request_body_dtor(&body);
 		if (info) {
 			http_request_info(&request, Z_ARRVAL_P(info));
 		}
 		RETVAL_RESPONSE_OR_BODY(request);
 	}
 	http_request_body_dtor(&body);
+	request.body = NULL;
 	http_request_dtor(&request);
 }
 /* }}} */
@@ -1328,13 +1319,13 @@ PHP_FUNCTION(http_put_stream)
 	http_request_init_ex(&request, NULL, HTTP_POST, URL);
 	request.body = &body;
 	if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) {
-		request.body = NULL;
 		http_request_exec(&request);
 		if (info) {
 			http_request_info(&request, Z_ARRVAL_P(info));
 		}
 		RETVAL_RESPONSE_OR_BODY(request);
 	}
+	request.body = NULL;
 	http_request_dtor(&request);
 }
 /* }}} */