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)
{
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);
if (obj->message) {
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;
}
zval *qdata = NULL;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!", &qdata)) {
- if ((!qdata) || Z_TYPE_P(qdata) == IS_NULL) {
- zend_update_property_stringl(php_http_client_request_class_entry, getThis(), ZEND_STRL("query"), "", 0 TSRMLS_CC);
- } else if ((Z_TYPE_P(qdata) == IS_ARRAY) || (Z_TYPE_P(qdata) == IS_OBJECT)) {
- char *query_data_str = NULL;
- size_t query_data_len;
-
- if (SUCCESS == php_http_url_encode_hash(HASH_OF(qdata), NULL, 0, &query_data_str, &query_data_len TSRMLS_CC)) {
- zend_update_property_stringl(php_http_client_request_class_entry, getThis(), ZEND_STRL("query"), query_data_str, query_data_len TSRMLS_CC);
- efree(query_data_str);
- }
+ php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ php_url *old_url = NULL, new_url = {NULL};
+ char empty[] = "";
+
+ if (qdata) {
+ zval arr, str;
+
+ INIT_PZVAL(&arr);
+ array_init(&arr);
+ INIT_PZVAL(&str);
+ ZVAL_NULL(&str);
+
+ php_http_querystring_update(&arr, qdata, &str TSRMLS_CC);
+ new_url.query = Z_STRVAL(str);
+ zval_dtor(&arr);
} else {
- zval *data = php_http_ztyp(IS_STRING, qdata);
+ new_url.query = &empty[0];
+ }
+
+ if (obj->message->http.info.request.url) {
+ old_url = php_url_parse(obj->message->http.info.request.url);
+ efree(obj->message->http.info.request.url);
+ }
+
+ php_http_url(PHP_HTTP_URL_REPLACE, old_url, &new_url, NULL, &obj->message->http.info.request.url, NULL TSRMLS_CC);
- zend_update_property_stringl(php_http_client_request_class_entry, getThis(), ZEND_STRL("query"), Z_STRVAL_P(data), Z_STRLEN_P(data) TSRMLS_CC);
- zval_ptr_dtor(&data);
+ if (old_url) {
+ php_url_free(old_url);
+ }
+ if (new_url.query != &empty[0]) {
+ STR_FREE(new_url.query);
}
}
RETVAL_ZVAL(getThis(), 1, 0);
PHP_METHOD(HttpClientRequest, getQuery)
{
if (SUCCESS == zend_parse_parameters_none()) {
- RETURN_PROP(php_http_client_request_class_entry, "query");
+ php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ if (obj->message->http.info.request.url) {
+ php_url *purl = php_url_parse(obj->message->http.info.request.url);
+
+ if (purl) {
+ if (purl->query) {
+ RETVAL_STRING(purl->query, 0);
+ purl->query = NULL;
+ }
+ php_url_free(purl);
+ }
+ }
}
- RETURN_FALSE;
}
PHP_METHOD(HttpClientRequest, addQuery)
{
zval *qdata;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &qdata)) {
- char *query_data_str = NULL;
- size_t query_data_len = 0;
- zval *old_qdata = php_http_ztyp(IS_STRING, zend_read_property(php_http_client_request_class_entry, getThis(), ZEND_STRL("query"), 0 TSRMLS_CC));
+ 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};
+
+ zval arr, str;
- if (SUCCESS == php_http_url_encode_hash(Z_ARRVAL_P(qdata), Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data_str, &query_data_len TSRMLS_CC)) {
- zend_update_property_stringl(php_http_client_request_class_entry, getThis(), ZEND_STRL("query"), query_data_str, query_data_len TSRMLS_CC);
- efree(query_data_str);
+ INIT_PZVAL(&arr);
+ array_init(&arr);
+ INIT_PZVAL(&str);
+ ZVAL_NULL(&str);
+
+ php_http_querystring_update(&arr, qdata, &str TSRMLS_CC);
+ new_url.query = Z_STRVAL(str);
+ zval_dtor(&arr);
+
+ if (obj->message->http.info.request.url) {
+ old_url = php_url_parse(obj->message->http.info.request.url);
+ efree(obj->message->http.info.request.url);
}
- zval_ptr_dtor(&old_qdata);
+ php_http_url(PHP_HTTP_URL_JOIN_QUERY, old_url, &new_url, NULL, &obj->message->http.info.request.url, NULL TSRMLS_CC);
+
+ if (old_url) {
+ php_url_free(old_url);
+ }
+ STR_FREE(new_url.query);
}
RETVAL_ZVAL(getThis(), 1, 0);
+}
+PHP_METHOD(HttpClientRequest, setOptions)
+{
+ zval *opts = NULL;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) {
+ php_http_client_options_set(getThis(), opts TSRMLS_CC);
+
+ RETVAL_ZVAL(getThis(), 1, 0);
+ }
}
+PHP_METHOD(HttpClientRequest, getOptions)
+{
+ if (SUCCESS == zend_parse_parameters_none()) {
+ RETURN_PROP(php_http_client_request_class_entry, "options");
+ }
+ RETURN_FALSE;
+}
-zend_class_entry *php_http_client_request_class_entry;
-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)
- EMPTY_FUNCTION_ENTRY
-};
+PHP_METHOD(HttpClientRequest, setSslOptions)
+{
+ zval *opts = NULL;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) {
+ php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 1 TSRMLS_CC);
+
+ RETVAL_ZVAL(getThis(), 1, 0);
+ }
+}
+
+PHP_METHOD(HttpClientRequest, addSslOptions)
+{
+ zval *opts = NULL;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) {
+ php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 0 TSRMLS_CC);
+
+ RETVAL_ZVAL(getThis(), 1, 0);
+ }
+}
+
+PHP_METHOD(HttpClientRequest, getSslOptions)
+{
+ if (SUCCESS == zend_parse_parameters_none()) {
+ php_http_client_options_get_subr(getThis(), ZEND_STRS("ssl"), return_value TSRMLS_CC);
+ }
+}
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_string(php_http_client_request_class_entry, ZEND_STRL("query"), "", ZEND_ACC_PROTECTED TSRMLS_CC);
+ zend_declare_property_null(php_http_client_request_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED TSRMLS_CC);
return SUCCESS;
}
projects / m6w6 / ext-http / blobdiff