X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client_response.c;h=2fe9d2c45d5fa2a87d9d3e97143f9512a16efd29;hp=bf08389405395c947d123ae9305bb37dd9dd65cf;hb=03045a17d712ce52e0a55c7d8f2cc30b48b3a645;hpb=0103bacf2e2ca5543a01229303d89c9c0cf1ec22 diff --git a/php_http_client_response.c b/php_http_client_response.c index bf08389..2fe9d2c 100644 --- a/php_http_client_response.c +++ b/php_http_client_response.c @@ -6,107 +6,131 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2011, Michael Wallner | + | Copyright (c) 2004-2014, Michael Wallner | +--------------------------------------------------------------------+ */ #include "php_http_api.h" -#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpClientResponse, method, 0, req_args) -#define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpClientResponse, method, 0) -#define PHP_HTTP_CLIENT_RESPONSE_ME(method, visibility) PHP_ME(HttpClientResponse, method, PHP_HTTP_ARGS(HttpClientResponse, method), visibility) -#define PHP_HTTP_CLIENT_RESPONSE_ALIAS(method, func) PHP_HTTP_STATIC_ME_ALIAS(method, func, PHP_HTTP_ARGS(HttpClientResponse, method)) -#define PHP_HTTP_CLIENT_RESPONSE_MALIAS(me, al, vis) ZEND_FENTRY(me, ZEND_MN(HttpClientResponse_##al), PHP_HTTP_ARGS(HttpClientResponse, al), vis) - -PHP_HTTP_BEGIN_ARGS(getCookies, 0) - PHP_HTTP_ARG_VAL(flags, 0) - PHP_HTTP_ARG_VAL(allowed_extras, 0) -PHP_HTTP_END_ARGS; - -PHP_METHOD(HttpClientResponse, getCookies) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientResponse_getCookies, 0, 0, 0) + ZEND_ARG_INFO(0, flags) + ZEND_ARG_INFO(0, allowed_extras) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientResponse, getCookies) { - long flags = 0; + zend_long flags = 0; zval *allowed_extras_array = NULL; + int i = 0; + char **allowed_extras = NULL; + zval *header = NULL, *entry = NULL; + php_http_message_object_t *msg; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|la!", &flags, &allowed_extras_array)) { - int i = 0; - char **allowed_extras = NULL; - zval *header = NULL, **entry = NULL; - HashPosition pos; - php_http_message_object_t *msg = zend_object_store_get_object(getThis() TSRMLS_CC); - - - array_init(return_value); + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|la!/", &flags, &allowed_extras_array)) { + return; + } - if (allowed_extras_array) { - allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *)); - FOREACH_VAL(pos, allowed_extras_array, entry) { - zval *data = php_http_ztyp(IS_STRING, *entry); - allowed_extras[i++] = estrndup(Z_STRVAL_P(data), Z_STRLEN_P(data)); - zval_ptr_dtor(&data); - } + msg = PHP_HTTP_OBJ(NULL, getThis()); + array_init(return_value); + + if (allowed_extras_array) { + /* FIXME: use zend_string** instead of char** */ + allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *)); + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(allowed_extras_array), entry) + { + zend_string *zs = zval_get_string(entry); + allowed_extras[i++] = estrndup(zs->val, zs->len); + zend_string_release(zs); } + ZEND_HASH_FOREACH_END(); + } - if ((header = php_http_message_header(msg->message, ZEND_STRL("Set-Cookie"), 0))) { - php_http_cookie_list_t *list; + if ((header = php_http_message_header(msg->message, ZEND_STRL("Set-Cookie")))) { + php_http_cookie_list_t *list; - if (Z_TYPE_P(header) == IS_ARRAY) { - zval **single_header; + if (Z_TYPE_P(header) == IS_ARRAY) { + zval *single_header; - FOREACH_VAL(pos, header, single_header) { - zval *data = php_http_ztyp(IS_STRING, *single_header); + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(header), single_header) + { + zend_string *zs = zval_get_string(single_header); - if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), Z_STRLEN_P(data), flags, allowed_extras TSRMLS_CC))) { - zval *cookie; + if ((list = php_http_cookie_list_parse(NULL, zs->val, zs->len, flags, allowed_extras))) { + zval cookie; - MAKE_STD_ZVAL(cookie); - ZVAL_OBJVAL(cookie, php_http_cookie_object_new_ex(php_http_cookie_get_class_entry(), list, NULL TSRMLS_CC), 0); - add_next_index_zval(return_value, cookie); - } - zval_ptr_dtor(&data); - } - } else { - zval *data = php_http_ztyp(IS_STRING, header); - if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), Z_STRLEN_P(data), flags, allowed_extras TSRMLS_CC))) { - zval *cookie; - - MAKE_STD_ZVAL(cookie); - ZVAL_OBJVAL(cookie, php_http_cookie_object_new_ex(php_http_cookie_get_class_entry(), list, NULL TSRMLS_CC), 0); - add_next_index_zval(return_value, cookie); + ZVAL_OBJ(&cookie, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo); + add_next_index_zval(return_value, &cookie); } - zval_ptr_dtor(&data); + zend_string_release(zs); } - zval_ptr_dtor(&header); - } + ZEND_HASH_FOREACH_END(); + } else { + zend_string *zs = zval_get_string(header); + + if ((list = php_http_cookie_list_parse(NULL, zs->val, zs->len, flags, allowed_extras))) { + zval cookie; - if (allowed_extras) { - for (i = 0; allowed_extras[i]; ++i) { - efree(allowed_extras[i]); + ZVAL_OBJ(&cookie, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo); + add_next_index_zval(return_value, &cookie); } - efree(allowed_extras); + zend_string_release(zs); } + } - return; + if (allowed_extras) { + for (i = 0; allowed_extras[i]; ++i) { + efree(allowed_extras[i]); + } + efree(allowed_extras); } - RETURN_FALSE; } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientResponse_getTransferInfo, 0, 0, 0) + ZEND_ARG_INFO(0, element) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClientResponse, getTransferInfo) +{ + char *info_name = NULL; + size_t info_len = 0; + zval info_tmp, info_name_tmp, *info; -static zend_class_entry *php_http_client_response_class_entry; + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &info_name, &info_len), invalid_arg, return); -zend_class_entry *php_http_client_response_get_class_entry(void) -{ - return php_http_client_response_class_entry; + info = zend_read_property(php_http_client_response_class_entry, getThis(), ZEND_STRL("transferInfo"), 0, &info_tmp); + + /* request completed? */ + if (Z_TYPE_P(info) != IS_OBJECT) { + php_http_throw(bad_method_call, "Incomplete state", NULL); + return; + } + + if (info_len && info_name) { + info = zend_read_property(NULL, info, php_http_pretty_key(info_name, info_len, 0, 0), info_len, 0, &info_name_tmp); + + if (!info) { + php_http_throw(unexpected_val, "Could not find transfer info with name '%s'", info_name); + return; + } + } + + RETURN_ZVAL_FAST(info); } -static zend_function_entry php_http_client_response_method_entry[] = { - PHP_HTTP_CLIENT_RESPONSE_ME(getCookies, ZEND_ACC_PUBLIC) +static zend_function_entry php_http_client_response_methods[] = { + PHP_ME(HttpClientResponse, getCookies, ai_HttpClientResponse_getCookies, ZEND_ACC_PUBLIC) + PHP_ME(HttpClientResponse, getTransferInfo, ai_HttpClientResponse_getTransferInfo, ZEND_ACC_PUBLIC) EMPTY_FUNCTION_ENTRY }; +zend_class_entry *php_http_client_response_class_entry; + PHP_MINIT_FUNCTION(http_client_response) { - PHP_HTTP_REGISTER_CLASS(http\\Client, Response, http_client_response, php_http_message_get_class_entry(), 0); + zend_class_entry ce = {0}; + + INIT_NS_CLASS_ENTRY(ce, "http\\Client", "Response", php_http_client_response_methods); + php_http_client_response_class_entry = zend_register_internal_class_ex(&ce, php_http_message_class_entry); + + zend_declare_property_null(php_http_client_response_class_entry, ZEND_STRL("transferInfo"), ZEND_ACC_PROTECTED); return SUCCESS; }