X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=php_http_client.c;h=47c7ef48bac90f24eb3a17ecca9ca3a8a0cd48b1;hb=c0d96fe2c0d156412bcb22bf5b9f5e9ed0046c9c;hp=06e90bafd889e2e7815f9bc533ef7b9bec87737f;hpb=759c822dcd99fdf733399a5ed92dbea382ddc474;p=m6w6%2Fext-http

diff --git a/php_http_client.c b/php_http_client.c
index 06e90ba..47c7ef4 100644
--- a/php_http_client.c
+++ b/php_http_client.c
@@ -197,6 +197,13 @@ PHP_HTTP_BEGIN_ARGS(getTransferInfo, 0)
 	PHP_HTTP_ARG_VAL(name, 0)
 PHP_HTTP_END_ARGS;
 
+PHP_HTTP_BEGIN_ARGS(request, 2)
+	PHP_HTTP_ARG_VAL(method, 0)
+	PHP_HTTP_ARG_VAL(url, 0)
+	PHP_HTTP_ARG_ARR(headers, 1, 0)
+	PHP_HTTP_ARG_VAL(body, 0)
+	PHP_HTTP_ARG_ARR(options, 1, 0)
+PHP_HTTP_END_ARGS;
 
 static zend_class_entry *php_http_client_class_entry;
 
@@ -239,6 +246,8 @@ static zend_function_entry php_http_client_method_entry[] = {
 	PHP_HTTP_CLIENT_ME(getResponseMessageClass, ZEND_ACC_PUBLIC)
 	PHP_HTTP_CLIENT_ME(setResponseMessageClass, ZEND_ACC_PUBLIC)
 
+	PHP_HTTP_CLIENT_ME(request, ZEND_ACC_PUBLIC)
+
 	EMPTY_FUNCTION_ENTRY
 };
 
@@ -318,10 +327,10 @@ static inline zend_object_value php_http_client_object_message(zval *this_ptr, p
 
 	if (Z_STRLEN_P(zcn)
 	&&	(class_entry = zend_fetch_class(Z_STRVAL_P(zcn), Z_STRLEN_P(zcn), 0 TSRMLS_CC))
-	&&	(SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_object_new_ex, php_http_client_response_class_entry, msg, NULL TSRMLS_CC))) {
+	&&	(SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_object_new_ex, php_http_client_response_get_class_entry(), msg, NULL TSRMLS_CC))) {
 		return ov;
 	} else {
-		return php_http_message_object_new_ex(php_http_client_response_class_entry, msg, NULL TSRMLS_CC);
+		return php_http_message_object_new_ex(php_http_client_response_get_class_entry(), msg, NULL TSRMLS_CC);
 	}
 }
 
@@ -441,7 +450,7 @@ STATUS php_http_client_object_handle_response(zval *zclient TSRMLS_DC)
 
 		/* update the actual request message */
 		MAKE_STD_ZVAL(message);
-		ZVAL_OBJVAL(message, php_http_message_object_new_ex(php_http_message_class_entry, php_http_message_copy_ex(msg, NULL, 0), NULL TSRMLS_CC), 0);
+		ZVAL_OBJVAL(message, php_http_message_object_new_ex(php_http_message_get_class_entry(), php_http_message_copy_ex(msg, NULL, 0), NULL TSRMLS_CC), 0);
 		zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("requestMessage"), message TSRMLS_CC);
 		zval_ptr_dtor(&message);
 	}
@@ -543,7 +552,7 @@ void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zva
 void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value TSRMLS_DC)
 {
 	zend_class_entry *this_ce = Z_OBJCE_P(getThis());
-	zval **options, *opts = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
+	zval **options, *opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
 
 	if ((Z_TYPE_P(opts) == IS_ARRAY) && (SUCCESS == zend_symtable_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) {
 		RETVAL_ZVAL(*options, 1, 0);
@@ -552,7 +561,7 @@ void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zva
 
 PHP_METHOD(HttpClient, __construct)
 {
-	with_error_handling(EH_THROW, php_http_exception_class_entry) {
+	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
 		zval *os, *opts = NULL;
 
 		MAKE_STD_ZVAL(os);
@@ -569,7 +578,7 @@ PHP_METHOD(HttpClient, __construct)
 
 PHP_METHOD(HttpClient, getObservers)
 {
-	with_error_handling(EH_THROW, php_http_exception_class_entry) {
+	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
 		if (SUCCESS == zend_parse_parameters_none()) {
 			RETVAL_PROP(php_http_client_class_entry, "observers");
 		}
@@ -802,7 +811,7 @@ PHP_METHOD(HttpClient, flushCookies)
 
 PHP_METHOD(HttpClient, getResponseMessage)
 {
-	with_error_handling(EH_THROW, php_http_exception_class_entry) {
+	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
 		if (SUCCESS == zend_parse_parameters_none()) {
 			zval *message = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("responseMessage"), 0 TSRMLS_CC);
 
@@ -817,7 +826,7 @@ PHP_METHOD(HttpClient, getResponseMessage)
 
 PHP_METHOD(HttpClient, getRequestMessage)
 {
-	with_error_handling(EH_THROW, php_http_exception_class_entry) {
+	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
 		if (SUCCESS == zend_parse_parameters_none()) {
 			zval *message = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("requestMessage"), 0 TSRMLS_CC);
 
@@ -832,7 +841,7 @@ PHP_METHOD(HttpClient, getRequestMessage)
 
 PHP_METHOD(HttpClient, getHistory)
 {
-	with_error_handling(EH_THROW, php_http_exception_class_entry) {
+	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
 		if (SUCCESS == zend_parse_parameters_none()) {
 			zval *hist = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("history"), 0 TSRMLS_CC);
 
@@ -889,13 +898,53 @@ PHP_METHOD(HttpClient, getRequest)
 	}
 }
 
+PHP_METHOD(HttpClient, request)
+{
+	char *meth_str, *url_str;
+	int meth_len, url_len;
+	zval *zheader, *zbody, *zoptions;
+
+	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
+		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a!z!a!/", &meth_str, &meth_len, &url_str, &url_len, &zheader, &zbody, &zoptions)) {
+			php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+			php_http_message_object_t *msg_obj;
+			zend_object_value ov;
+			zval *req, *res = NULL;
+
+			php_http_new(&ov, php_http_client_request_get_class_entry(), (php_http_new_t) php_http_message_object_new_ex, NULL, NULL, (void *) &msg_obj TSRMLS_CC);
+			MAKE_STD_ZVAL(req);
+			ZVAL_OBJVAL(req, ov, 0);
+
+			msg_obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST TSRMLS_CC);
+			PHP_HTTP_INFO(msg_obj->message).request.url = estrndup(url_str, url_len);
+			PHP_HTTP_INFO(msg_obj->message).request.method = estrndup(meth_str, meth_len);
+
+			if (zheader) {
+				array_copy(Z_ARRVAL_P(zheader), &msg_obj->message->hdrs);
+			}
+
+			if (zbody) {
+				php_http_message_object_set_body(msg_obj, zbody TSRMLS_CC);
+			}
+
+			if (zoptions) {
+				php_http_client_options_set(req, zoptions TSRMLS_CC);
+			}
+
+			zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "send", &res, req);
+			RETVAL_ZVAL(res, 0, 1);
+			zval_ptr_dtor(&req);
+		}
+	} end_error_handling();
+}
+
 PHP_METHOD(HttpClient, send)
 {
 	zval *zreq = NULL;
 
 	RETVAL_FALSE;
 
-	with_error_handling(EH_THROW, php_http_exception_class_entry) {
+	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
 		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O!", &zreq, php_http_client_request_get_class_entry())) {
 			if (SUCCESS == php_http_client_object_handle_request(getThis(), &zreq TSRMLS_CC)) {
 				php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
@@ -917,12 +966,12 @@ PHP_METHOD(HttpClient, send)
 
 PHP_MINIT_FUNCTION(http_client)
 {
-	PHP_HTTP_REGISTER_CLASS(http\\Client, AbstractClient, http_client, php_http_object_class_entry, ZEND_ACC_ABSTRACT);
+	PHP_HTTP_REGISTER_CLASS(http\\Client, AbstractClient, http_client, php_http_object_get_class_entry(), ZEND_ACC_ABSTRACT);
 	php_http_client_class_entry->create_object = php_http_client_object_new;
 	memcpy(&php_http_client_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_client_object_handlers.clone_obj = php_http_client_object_clone;
 
-	zend_class_implements(php_http_client_class_entry TSRMLS_CC, 2, spl_ce_SplSubject, php_http_client_interface_class_entry);
+	zend_class_implements(php_http_client_class_entry TSRMLS_CC, 2, spl_ce_SplSubject, php_http_client_interface_get_class_entry());
 
 	zend_declare_property_string(php_http_client_class_entry, ZEND_STRL("responseMessageClass"), "", ZEND_ACC_PRIVATE TSRMLS_CC);
 	zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("observers"), ZEND_ACC_PRIVATE TSRMLS_CC);