change array_list API

[m6w6/ext-http] / php_http_client_request.c

diff --git a/php_http_client_request.c b/php_http_client_request.c
index 697dbb5e9f800a3e01cc94f719bf689c8b3d6625..2050bf2fe7153b9dccd39ec2fe26abbfc36507cd 100644 (file)
--- a/php_http_client_request.c
+++ b/php_http_client_request.c
@@ -39,6 +39,43 @@ 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)
 {
@@ -46,8 +83,8 @@ 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) {
@@ -108,7 +145,7 @@ PHP_METHOD(HttpClientRequest, getContentType)
                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;
 }
@@ -180,7 +217,6 @@ PHP_METHOD(HttpClientRequest, addQuery)
        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;
 
@@ -208,21 +244,59 @@ PHP_METHOD(HttpClientRequest, addQuery)
        RETVAL_ZVAL(getThis(), 1, 0);
 }
 
+PHP_METHOD(HttpClientRequest, setOptions)
+{
+       zval *opts = NULL;
 
-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
-};
+       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;
+}
+
+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_null(php_http_client_request_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED TSRMLS_CC);
 
        return SUCCESS;
 }