-#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)
+void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zval *opts, int overwrite);
+void php_http_client_options_set(zval *this_ptr, zval *opts);
+void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value);
+
+#define PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj) \
+ do { \
+ if (!obj->message) { \
+ obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL); \
+ } \
+ } while(0)
+
+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;
+ size_t meth_len = 0;
+ zval *zheaders = NULL, *zbody = NULL, *zurl = NULL;
+ php_http_message_object_t *obj;
+
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s!z!a!O!", &meth_str, &meth_len, &zurl, &zheaders, &zbody, php_http_message_body_class_entry), invalid_arg, return);
+
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ if (obj->message) {
+ php_http_message_set_type(obj->message, PHP_HTTP_REQUEST);
+ } else {
+ obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL);
+ }
+
+ if (zbody) {
+ php_http_expect(SUCCESS == php_http_message_object_set_body(obj, zbody), unexpected_val, return);
+ }
+ if (meth_str && meth_len) {
+ PHP_HTTP_INFO(obj->message).request.method = estrndup(meth_str, meth_len);
+ }
+ if (zurl) {
+ PHP_HTTP_INFO(obj->message).request.url = php_http_url_from_zval(zurl, ~0);
+ }
+ if (zheaders) {
+ array_copy(Z_ARRVAL_P(zheaders), &obj->message->hdrs);
+ }
+}
+
+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)
+{
+ zend_string *ct_str;
+ php_http_message_object_t *obj;
+ zval zct;