#include "php_http_api.h"
+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);
+
#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)
int meth_len = 0, url_len = 0;
zval *zheaders = NULL, *zbody = NULL;
- 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)) {
+ 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())) {
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) {
+ body_obj = zend_object_store_get_object(zbody TSRMLS_CC);
+ Z_OBJ_ADDREF_P(zbody);
+ obj->body = Z_OBJVAL_P(zbody);
+ php_http_message_body_addref(body_obj->body);
+ }
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) {
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_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;
}
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &qdata)) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
php_url *old_url = NULL, new_url = {NULL};
- char empty[] = "";
zval arr, str;
PHP_MINIT_FUNCTION(http_client_request)
{
- PHP_HTTP_REGISTER_CLASS(http\\Client, Request, http_client_request, php_http_message_class_entry, 0);
+ PHP_HTTP_REGISTER_CLASS(http\\Client, Request, http_client_request, php_http_message_get_class_entry(), 0);
zend_declare_property_null(php_http_client_request_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED TSRMLS_CC);