X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client_request.c;h=86843e6428b8d6199b50450b2e79de24db29df7c;hp=c073512ed5f02871e4054bb9b1cec20e4dc1ef86;hb=bc336340e111d6eff9d7236bc7a7129925469ae1;hpb=bd80b17b026a00a254ee8693cd7bacf1ebdec4cf diff --git a/php_http_client_request.c b/php_http_client_request.c index c073512..86843e6 100644 --- a/php_http_client_request.c +++ b/php_http_client_request.c @@ -6,91 +6,45 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2011, Michael Wallner | + | Copyright (c) 2004-2013, Michael Wallner | +--------------------------------------------------------------------+ */ #include "php_http_api.h" -#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpClientRequest, method, 0, req_args) -#define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpClientRequest, method, 0) -#define PHP_HTTP_CLIENT_REQUEST_ME(method, visibility) PHP_ME(HttpClientRequest, method, PHP_HTTP_ARGS(HttpClientRequest, method), visibility) -#define PHP_HTTP_CLIENT_REQUEST_ALIAS(method, func) PHP_HTTP_STATIC_ME_ALIAS(method, func, PHP_HTTP_ARGS(HttpClientRequest, method)) -#define PHP_HTTP_CLIENT_REQUEST_MALIAS(me, al, vis) ZEND_FENTRY(me, ZEND_MN(HttpClientRequest_##al), PHP_HTTP_ARGS(HttpClientRequest, al), vis) - -PHP_HTTP_BEGIN_ARGS(__construct, 0) - PHP_HTTP_ARG_VAL(method, 0) - PHP_HTTP_ARG_VAL(url, 0) - PHP_HTTP_ARG_ARR(headers, 1, 0) - PHP_HTTP_ARG_OBJ(http\\Message\\Body, body, 1) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getContentType); -PHP_HTTP_BEGIN_ARGS(setContentType, 1) - PHP_HTTP_ARG_VAL(content_type, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getQuery); -PHP_HTTP_BEGIN_ARGS(setQuery, 0) - PHP_HTTP_ARG_VAL(query_data, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(addQuery, 1) - PHP_HTTP_ARG_VAL(query_data, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getOptions); -PHP_HTTP_BEGIN_ARGS(setOptions, 0) - PHP_HTTP_ARG_ARR(options, 1, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(getSslOptions); -PHP_HTTP_BEGIN_ARGS(setSslOptions, 0) - PHP_HTTP_ARG_ARR(ssl_options, 1, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(addSslOptions, 0) - PHP_HTTP_ARG_ARR(ssl_options, 1, 0) -PHP_HTTP_END_ARGS; - - -static zend_class_entry *php_http_client_request_class_entry; - -zend_class_entry * php_http_client_request_get_class_entry(void) -{ - return php_http_client_request_class_entry; -} - -static zend_function_entry php_http_client_request_method_entry[] = { - PHP_HTTP_CLIENT_REQUEST_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_HTTP_CLIENT_REQUEST_ME(getQuery, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_REQUEST_ME(setQuery, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_REQUEST_ME(addQuery, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_REQUEST_ME(getContentType, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_REQUEST_ME(setContentType, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_REQUEST_ME(setOptions, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_REQUEST_ME(getOptions, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_REQUEST_ME(setSslOptions, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_REQUEST_ME(getSslOptions, ZEND_ACC_PUBLIC) - PHP_HTTP_CLIENT_REQUEST_ME(addSslOptions, ZEND_ACC_PUBLIC) - EMPTY_FUNCTION_ENTRY -}; - - -PHP_METHOD(HttpClientRequest, __construct) +void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zval *opts, int overwrite TSRMLS_DC); +void php_http_client_options_set(zval *this_ptr, zval *opts TSRMLS_DC); +void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value TSRMLS_DC); + +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest___construct, 0, 0, 0) + ZEND_ARG_INFO(0, method) + ZEND_ARG_INFO(0, url) + ZEND_ARG_ARRAY_INFO(0, headers, 1) + ZEND_ARG_OBJ_INFO(0, body, http\\Message\\Body, 1) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientRequest, __construct) { char *meth_str = NULL, *url_str = NULL; int meth_len = 0, url_len = 0; zval *zheaders = NULL, *zbody = NULL; - with_error_handling(EH_THROW, php_http_exception_get_class_entry()) { - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!a!O!", &meth_str, &meth_len, &url_str, &url_len, &zheaders, &zbody, php_http_message_body_get_class_entry())) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!a!O!", &meth_str, &meth_len, &url_str, &url_len, &zheaders, &zbody, php_http_message_body_class_entry)) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_body_object_t *body_obj = NULL; + + if (zbody) { + php_http_message_object_set_body(obj, zbody TSRMLS_CC); + } if (obj->message) { php_http_message_set_type(obj->message, PHP_HTTP_REQUEST); + if (body_obj) { + php_http_message_body_free(&obj->message->body); + obj->message->body = body_obj->body; + } } else { - obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST TSRMLS_CC); + obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, body_obj ? body_obj->body : NULL TSRMLS_CC); } if (meth_str && meth_len) { @@ -102,20 +56,14 @@ PHP_METHOD(HttpClientRequest, __construct) if (zheaders) { array_copy(Z_ARRVAL_P(zheaders), &obj->message->hdrs); } - if (zbody) { - php_http_message_body_object_t *body_obj = zend_object_store_get_object(zbody TSRMLS_CC); - - php_http_message_body_dtor(&obj->message->body); - php_http_message_body_copy(body_obj->body, &obj->message->body, 0); - Z_OBJ_ADDREF_P(zbody); - obj->body = Z_OBJVAL_P(zbody); - } } } end_error_handling(); } - -PHP_METHOD(HttpClientRequest, setContentType) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_setContentType, 0, 0, 1) + ZEND_ARG_INFO(0, content_type) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientRequest, setContentType) { char *ct_str; int ct_len; @@ -139,18 +87,23 @@ PHP_METHOD(HttpClientRequest, setContentType) RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpClientRequest, getContentType) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_getContentType, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientRequest, getContentType) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); zval *zct = php_http_message_header(obj->message, ZEND_STRL("Content-Type"), 1); - RETURN_ZVAL(zct, 0, 0); + RETURN_ZVAL(zct, 0, 1); } RETURN_FALSE; } -PHP_METHOD(HttpClientRequest, setQuery) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_setQuery, 0, 0, 0) + ZEND_ARG_INFO(0, query_data) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientRequest, setQuery) { zval *qdata = NULL; @@ -191,7 +144,9 @@ PHP_METHOD(HttpClientRequest, setQuery) RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpClientRequest, getQuery) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_getQuery, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientRequest, getQuery) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); @@ -210,7 +165,10 @@ PHP_METHOD(HttpClientRequest, getQuery) } } -PHP_METHOD(HttpClientRequest, addQuery) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_addQuery, 0, 0, 1) + ZEND_ARG_INFO(0, query_data) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientRequest, addQuery) { zval *qdata; @@ -244,7 +202,10 @@ PHP_METHOD(HttpClientRequest, addQuery) RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpClientRequest, setOptions) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_setOptions, 0, 0, 0) + ZEND_ARG_ARRAY_INFO(0, options, 1) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientRequest, setOptions) { zval *opts = NULL; @@ -255,15 +216,21 @@ PHP_METHOD(HttpClientRequest, setOptions) } } -PHP_METHOD(HttpClientRequest, getOptions) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_getOptions, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientRequest, getOptions) { if (SUCCESS == zend_parse_parameters_none()) { - RETURN_PROP(php_http_client_request_class_entry, "options"); + zval *zoptions = zend_read_property(php_http_client_request_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); + RETURN_ZVAL(zoptions, 1, 0); } RETURN_FALSE; } -PHP_METHOD(HttpClientRequest, setSslOptions) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_setSslOptions, 0, 0, 0) + ZEND_ARG_ARRAY_INFO(0, ssl_options, 1) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientRequest, setSslOptions) { zval *opts = NULL; @@ -274,7 +241,10 @@ PHP_METHOD(HttpClientRequest, setSslOptions) } } -PHP_METHOD(HttpClientRequest, addSslOptions) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_addSslOptions, 0, 0, 0) + ZEND_ARG_ARRAY_INFO(0, ssl_options, 1) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientRequest, addSslOptions) { zval *opts = NULL; @@ -285,16 +255,38 @@ PHP_METHOD(HttpClientRequest, addSslOptions) } } -PHP_METHOD(HttpClientRequest, getSslOptions) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_getSslOptions, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientRequest, getSslOptions) { if (SUCCESS == zend_parse_parameters_none()) { php_http_client_options_get_subr(getThis(), ZEND_STRS("ssl"), return_value TSRMLS_CC); } } +static zend_function_entry php_http_client_request_methods[] = { + PHP_ME(HttpClientRequest, __construct, ai_HttpClientRequest___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(HttpClientRequest, setContentType, ai_HttpClientRequest_setContentType, ZEND_ACC_PUBLIC) + PHP_ME(HttpClientRequest, getContentType, ai_HttpClientRequest_getContentType, ZEND_ACC_PUBLIC) + PHP_ME(HttpClientRequest, setQuery, ai_HttpClientRequest_setQuery, ZEND_ACC_PUBLIC) + PHP_ME(HttpClientRequest, getQuery, ai_HttpClientRequest_getQuery, ZEND_ACC_PUBLIC) + PHP_ME(HttpClientRequest, addQuery, ai_HttpClientRequest_addQuery, ZEND_ACC_PUBLIC) + PHP_ME(HttpClientRequest, setOptions, ai_HttpClientRequest_setOptions, ZEND_ACC_PUBLIC) + PHP_ME(HttpClientRequest, getOptions, ai_HttpClientRequest_getOptions, ZEND_ACC_PUBLIC) + PHP_ME(HttpClientRequest, setSslOptions, ai_HttpClientRequest_setSslOptions, ZEND_ACC_PUBLIC) + PHP_ME(HttpClientRequest, getSslOptions, ai_HttpClientRequest_getSslOptions, ZEND_ACC_PUBLIC) + PHP_ME(HttpClientRequest, addSslOptions, ai_HttpClientRequest_addSslOptions, ZEND_ACC_PUBLIC) + EMPTY_FUNCTION_ENTRY +}; + +zend_class_entry *php_http_client_request_class_entry; + PHP_MINIT_FUNCTION(http_client_request) { - PHP_HTTP_REGISTER_CLASS(http\\Client, Request, http_client_request, php_http_message_get_class_entry(), 0); + zend_class_entry ce = {0}; + + INIT_NS_CLASS_ENTRY(ce, "http\\Client", "Request", php_http_client_request_methods); + php_http_client_request_class_entry = zend_register_internal_class_ex(&ce, php_http_message_class_entry, NULL TSRMLS_CC); zend_declare_property_null(php_http_client_request_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED TSRMLS_CC);