X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_functions.c;h=89a8c61ca093c6ca1086a513e8121830676f73fd;hb=33601b5f7d0b26b1e7f95ca44f349426594fbece;hp=04377f54ac12c34d94082d799a3916f4f3246b6e;hpb=370748ba4211ca298fec6706343413888c8b393f;p=m6w6%2Fext-http

diff --git a/http_functions.c b/http_functions.c
index 04377f5..89a8c61 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -250,7 +250,7 @@ PHP_FUNCTION(http_build_str)
 		zval **value; \
 		 \
 		zend_hash_internal_pointer_reset(Z_ARRVAL_P(supported)); \
-		if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void **) &value)) { \
+		if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void *) &value)) { \
 			RETVAL_ZVAL(*value, 1, 0); \
 		} else { \
 			RETVAL_NULL(); \
@@ -1034,6 +1034,7 @@ PHP_FUNCTION(http_parse_headers)
 	array_init(return_value);
 	if (SUCCESS != http_parse_headers(header, return_value)) {
 		zval_dtor(return_value);
+		http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse headers");
 		RETURN_FALSE;
 	}
 }
@@ -1206,7 +1207,7 @@ PHP_FUNCTION(http_match_request_header)
 		zval **bodyonly; \
 		 \
 		/* check if only the body should be returned */ \
-		if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void **) &bodyonly)) && zval_is_true(*bodyonly)) { \
+		if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void *) &bodyonly)) && zval_is_true(*bodyonly)) { \
 			http_message *msg = http_message_parse(PHPSTR_VAL(&request.conv.response), PHPSTR_LEN(&request.conv.response)); \
 			 \
 			if (msg) { \
@@ -1623,6 +1624,49 @@ PHP_FUNCTION(http_put_data)
 	http_request_dtor(&request);
 }
 /* }}} */
+
+/* {{{ proto string http_request(int method, string url[, string body[, array options[, array &info]]])
+ *
+ * Performs a custom HTTP request on the supplied url.
+ *
+ * Expects the first parameter to be an integer specifying the request method to use.
+ * Accepts an optional third string parameter containing the raw request body.
+ * See http_get() for a full list of available options.
+ *
+ * Returns the HTTP response(s) as string on success, or FALSE on failure.
+ */
+PHP_FUNCTION(http_request)
+{
+	long meth;
+	char *URL, *data = NULL;
+	int URL_len, data_len = 0;
+	zval *options = NULL, *info = NULL;
+	http_request_body body;
+	http_request request;
+	
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls|sa/!z", &meth, &URL, &URL_len, &data, &data_len, &options, &info)) {
+		RETURN_FALSE;
+	}
+	
+	if (info) {
+		zval_dtor(info);
+		array_init(info);
+	}
+	
+	RETVAL_FALSE;
+	
+	http_request_init_ex(&request, NULL, meth, URL);
+	request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, data, data_len, 0);
+	if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) {
+		http_request_exec(&request);
+		if (info) {
+			http_request_info(&request, Z_ARRVAL_P(info));
+		}
+		RETVAL_RESPONSE_OR_BODY(request);
+	}
+	http_request_dtor(&request);
+}
+/* }}} */
 #endif /* HTTP_HAVE_CURL */
 /* }}} HAVE_CURL */