| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2014, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#include "php_http_api.h"
+#include "php_http_client.h"
#include <ext/spl/spl_observer.h>
-#include <ext/standard/php_array.h>
-PHP_HTTP_API php_http_client_t *php_http_client_init(php_http_client_t *h, php_http_client_ops_t *ops, php_http_resource_factory_t *rf, void *init_arg TSRMLS_DC)
+/*
+ * array of name => php_http_client_driver_t*
+ */
+static HashTable php_http_client_drivers;
+
+ZEND_RESULT_CODE php_http_client_driver_add(php_http_client_driver_t *driver)
+{
+ return zend_hash_add(&php_http_client_drivers, driver->name_str, driver->name_len + 1, (void *) driver, sizeof(php_http_client_driver_t), NULL);
+}
+
+ZEND_RESULT_CODE php_http_client_driver_get(const char *name_str, size_t name_len, php_http_client_driver_t *driver)
+{
+ php_http_client_driver_t *tmp;
+
+ if ((name_str && SUCCESS == zend_hash_find(&php_http_client_drivers, name_str, name_len + 1, (void *) &tmp))
+ || (SUCCESS == zend_hash_get_current_data(&php_http_client_drivers, (void *) &tmp))) {
+ *driver = *tmp;
+ return SUCCESS;
+ }
+ return FAILURE;
+}
+
+static int apply_driver_list(void *p, void *arg TSRMLS_DC)
+{
+ php_http_client_driver_t *d = p;
+ zval *zname;
+
+ MAKE_STD_ZVAL(zname);
+ ZVAL_STRINGL(zname, d->name_str, d->name_len, 1);
+
+ zend_hash_next_index_insert(arg, &zname, sizeof(zval *), NULL);
+ return ZEND_HASH_APPLY_KEEP;
+}
+
+void php_http_client_driver_list(HashTable *ht TSRMLS_DC)
+{
+ zend_hash_apply_with_argument(&php_http_client_drivers, apply_driver_list, ht TSRMLS_CC);
+}
+
+void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zval *opts, int overwrite TSRMLS_DC)
+{
+ if (overwrite || (opts && zend_hash_num_elements(Z_ARRVAL_P(opts)))) {
+ zend_class_entry *this_ce = Z_OBJCE_P(getThis());
+ zval *old_opts, *new_opts, **entry = NULL;
+
+ MAKE_STD_ZVAL(new_opts);
+ array_init(new_opts);
+ old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
+ if (Z_TYPE_P(old_opts) == IS_ARRAY) {
+ array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts));
+ }
+
+ if (overwrite) {
+ if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) {
+ Z_ADDREF_P(opts);
+ zend_symtable_update(Z_ARRVAL_P(new_opts), key, len, (void *) &opts, sizeof(zval *), NULL);
+ } else {
+ zend_symtable_del(Z_ARRVAL_P(new_opts), key, len);
+ }
+ } else if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) {
+ if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) {
+ array_join(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry), 0, 0);
+ } else {
+ Z_ADDREF_P(opts);
+ zend_symtable_update(Z_ARRVAL_P(new_opts), key, len, (void *) &opts, sizeof(zval *), NULL);
+ }
+ }
+
+ zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC);
+ zval_ptr_dtor(&new_opts);
+ }
+}
+
+void php_http_client_options_set(zval *this_ptr, zval *opts TSRMLS_DC)
+{
+ php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+ HashPosition pos;
+ zval *new_opts;
+ zend_class_entry *this_ce = Z_OBJCE_P(getThis());
+ zend_bool is_client = instanceof_function(this_ce, php_http_client_class_entry TSRMLS_CC);
+
+ MAKE_STD_ZVAL(new_opts);
+ array_init(new_opts);
+
+ if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) {
+ zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC);
+ zval_ptr_dtor(&new_opts);
+ } else {
+ zval *old_opts, *add_opts, **opt;
+
+ MAKE_STD_ZVAL(add_opts);
+ array_init(add_opts);
+ /* some options need extra attention -- thus cannot use array_merge() directly */
+ FOREACH_KEYVAL(pos, opts, key, opt) {
+ if (key.type == HASH_KEY_IS_STRING) {
+#define KEYMATCH(k, s) ((sizeof(s)==k.len) && !strcasecmp(k.str, s))
+ if (Z_TYPE_PP(opt) == IS_ARRAY && (KEYMATCH(key, "ssl") || KEYMATCH(key, "cookies"))) {
+ php_http_client_options_set_subr(getThis(), key.str, key.len, *opt, 0 TSRMLS_CC);
+ } else if (is_client && (KEYMATCH(key, "recordHistory") || KEYMATCH(key, "responseMessageClass"))) {
+ zend_update_property(this_ce, getThis(), key.str, key.len-1, *opt TSRMLS_CC);
+ } else if (Z_TYPE_PP(opt) == IS_NULL) {
+ old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
+ if (Z_TYPE_P(old_opts) == IS_ARRAY) {
+ zend_symtable_del(Z_ARRVAL_P(old_opts), key.str, key.len);
+ }
+ } else {
+ Z_ADDREF_P(*opt);
+ add_assoc_zval_ex(add_opts, key.str, key.len, *opt);
+ }
+ }
+ }
+
+ old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
+ if (Z_TYPE_P(old_opts) == IS_ARRAY) {
+ array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts));
+ }
+ array_join(Z_ARRVAL_P(add_opts), Z_ARRVAL_P(new_opts), 0, 0);
+ zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC);
+ zval_ptr_dtor(&new_opts);
+ zval_ptr_dtor(&add_opts);
+ }
+}
+
+void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value TSRMLS_DC)
+{
+ zend_class_entry *this_ce = Z_OBJCE_P(getThis());
+ zval **options, *opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
+
+ if ((Z_TYPE_P(opts) == IS_ARRAY) && (SUCCESS == zend_symtable_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) {
+ RETVAL_ZVAL(*options, 1, 0);
+ }
+}
+
+static void queue_dtor(void *enqueued)
+{
+ php_http_client_enqueue_t *e = enqueued;
+
+ if (e->dtor) {
+ e->dtor(e);
+ }
+}
+
+php_http_client_t *php_http_client_init(php_http_client_t *h, php_http_client_ops_t *ops, php_resource_factory_t *rf, void *init_arg TSRMLS_DC)
{
php_http_client_t *free_h = NULL;
if (rf) {
h->rf = rf;
} else if (ops->rsrc) {
- h->rf = php_http_resource_factory_init(NULL, h->ops->rsrc, h, NULL);
+ h->rf = php_resource_factory_init(NULL, h->ops->rsrc, h, NULL);
}
- h->request.buffer = php_http_buffer_init(NULL);
- h->request.parser = php_http_message_parser_init(NULL TSRMLS_CC);
- h->request.message = php_http_message_init(NULL, 0 TSRMLS_CC);
-
- h->response.buffer = php_http_buffer_init(NULL);
- h->response.parser = php_http_message_parser_init(NULL TSRMLS_CC);
- h->response.message = php_http_message_init(NULL, 0 TSRMLS_CC);
-
+ zend_llist_init(&h->requests, sizeof(php_http_client_enqueue_t), queue_dtor, 0);
+ zend_llist_init(&h->responses, sizeof(void *), NULL, 0);
TSRMLS_SET_CTX(h->ts);
if (h->ops->init) {
if (!(h = h->ops->init(h, init_arg))) {
- php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "Could not initialize request");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize client");
if (free_h) {
- h->ops->dtor = NULL;
- php_http_client_free(&free_h);
+ efree(free_h);
}
}
}
return h;
}
-PHP_HTTP_API void php_http_client_dtor(php_http_client_t *h)
+php_http_client_t *php_http_client_copy(php_http_client_t *from, php_http_client_t *to)
{
- if (h->ops->dtor) {
- h->ops->dtor(h);
+ if (from->ops->copy) {
+ return from->ops->copy(from, to);
}
- php_http_resource_factory_free(&h->rf);
+ return NULL;
+}
- php_http_message_parser_free(&h->request.parser);
- php_http_message_free(&h->request.message);
- php_http_buffer_free(&h->request.buffer);
+void php_http_client_dtor(php_http_client_t *h)
+{
+ php_http_client_reset(h);
- php_http_message_parser_free(&h->response.parser);
- php_http_message_free(&h->response.message);
- php_http_buffer_free(&h->response.buffer);
+ if (h->ops->dtor) {
+ h->ops->dtor(h);
+ }
+
+ php_resource_factory_free(&h->rf);
}
-PHP_HTTP_API void php_http_client_free(php_http_client_t **h)
-{
+void php_http_client_free(php_http_client_t **h) {
if (*h) {
php_http_client_dtor(*h);
efree(*h);
}
}
-PHP_HTTP_API php_http_client_t *php_http_client_copy(php_http_client_t *from, php_http_client_t *to)
+ZEND_RESULT_CODE php_http_client_enqueue(php_http_client_t *h, php_http_client_enqueue_t *enqueue)
{
- if (!from->ops->copy) {
- return NULL;
- } else {
- TSRMLS_FETCH_FROM_CTX(from->ts);
+ TSRMLS_FETCH_FROM_CTX(h->ts);
- if (!to) {
- to = ecalloc(1, sizeof(*to));
+ if (h->ops->enqueue) {
+ if (php_http_client_enqueued(h, enqueue->request, NULL)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to enqueue request; request already in queue");
+ return FAILURE;
}
+ return h->ops->enqueue(h, enqueue);
+ }
- to->ops = from->ops;
- if (from->rf) {
- php_http_resource_factory_addref(from->rf);
- to->rf = from->rf;
- } else if (to->ops->rsrc){
- to->rf = php_http_resource_factory_init(NULL, to->ops->rsrc, to, NULL);
+ return FAILURE;
+}
+
+ZEND_RESULT_CODE php_http_client_dequeue(php_http_client_t *h, php_http_message_t *request)
+{
+ TSRMLS_FETCH_FROM_CTX(h->ts);
+
+ if (h->ops->dequeue) {
+ php_http_client_enqueue_t *enqueue = php_http_client_enqueued(h, request, NULL);
+
+ if (!enqueue) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to dequeue request; request not in queue");
+ return FAILURE;
}
+ return h->ops->dequeue(h, enqueue);
+ }
+ return FAILURE;
+}
+
+php_http_client_enqueue_t *php_http_client_enqueued(php_http_client_t *h, void *compare_arg, php_http_client_enqueue_cmp_func_t compare_func)
+{
+ zend_llist_element *el = NULL;
- to->request.buffer = php_http_buffer_init(NULL);
- to->request.parser = php_http_message_parser_init(NULL TSRMLS_CC);
- to->request.message = php_http_message_init(NULL, 0 TSRMLS_CC);
+ if (compare_func) {
+ for (el = h->requests.head; el; el = el->next) {
+ if (compare_func((php_http_client_enqueue_t *) el->data, compare_arg)) {
+ break;
+ }
+ }
+ } else {
+ for (el = h->requests.head; el; el = el->next) {
+ if (((php_http_client_enqueue_t *) el->data)->request == compare_arg) {
+ break;
+ }
+ }
+ }
+ return el ? (php_http_client_enqueue_t *) el->data : NULL;
+}
- to->response.buffer = php_http_buffer_init(NULL);
- to->response.parser = php_http_message_parser_init(NULL TSRMLS_CC);
- to->response.message = php_http_message_init(NULL, 0 TSRMLS_CC);
+ZEND_RESULT_CODE php_http_client_wait(php_http_client_t *h, struct timeval *custom_timeout)
+{
+ if (h->ops->wait) {
+ return h->ops->wait(h, custom_timeout);
+ }
- TSRMLS_SET_CTX(to->ts);
+ return FAILURE;
+}
- return to->ops->copy(from, to);
+int php_http_client_once(php_http_client_t *h)
+{
+ if (h->ops->once) {
+ return h->ops->once(h);
}
+
+ return FAILURE;
}
-PHP_HTTP_API STATUS php_http_client_exec(php_http_client_t *h, php_http_message_t *msg)
+ZEND_RESULT_CODE php_http_client_exec(php_http_client_t *h)
{
if (h->ops->exec) {
- return h->ops->exec(h, msg);
+ return h->ops->exec(h);
}
+
return FAILURE;
}
-PHP_HTTP_API STATUS php_http_client_reset(php_http_client_t *h)
+void php_http_client_reset(php_http_client_t *h)
{
if (h->ops->reset) {
- return h->ops->reset(h);
+ h->ops->reset(h);
}
- return FAILURE;
+
+ zend_llist_clean(&h->requests);
+ zend_llist_clean(&h->responses);
}
-PHP_HTTP_API STATUS php_http_client_setopt(php_http_client_t *h, php_http_client_setopt_opt_t opt, void *arg)
+ZEND_RESULT_CODE php_http_client_setopt(php_http_client_t *h, php_http_client_setopt_opt_t opt, void *arg)
{
if (h->ops->setopt) {
return h->ops->setopt(h, opt, arg);
}
+
return FAILURE;
}
-PHP_HTTP_API STATUS php_http_client_getopt(php_http_client_t *h, php_http_client_getopt_opt_t opt, void *arg)
+ZEND_RESULT_CODE php_http_client_getopt(php_http_client_t *h, php_http_client_getopt_opt_t opt, void *arg, void *res_ptr)
{
if (h->ops->getopt) {
- return h->ops->getopt(h, opt, arg);
+ return h->ops->getopt(h, opt, arg, res_ptr);
}
return FAILURE;
}
-#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpClient, method, 0, req_args)
-#define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpClient, method, 0)
-#define PHP_HTTP_CLIENT_ME(method, visibility) PHP_ME(HttpClient, method, PHP_HTTP_ARGS(HttpClient, method), visibility)
-#define PHP_HTTP_CLIENT_ALIAS(method, func) PHP_HTTP_STATIC_ME_ALIAS(method, func, PHP_HTTP_ARGS(HttpClient, method))
-#define PHP_HTTP_CLIENT_MALIAS(me, al, vis) ZEND_FENTRY(me, ZEND_MN(HttpClient_##al), PHP_HTTP_ARGS(HttpClient, al), vis)
-
-PHP_HTTP_BEGIN_ARGS(__construct, 0)
- PHP_HTTP_ARG_ARR(options, 1, 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;
-
-PHP_HTTP_EMPTY_ARGS(getCookies);
-PHP_HTTP_BEGIN_ARGS(setCookies, 0)
- PHP_HTTP_ARG_VAL(cookies, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(addCookies, 1)
- PHP_HTTP_ARG_VAL(cookies, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(enableCookies);
-PHP_HTTP_BEGIN_ARGS(resetCookies, 0)
- PHP_HTTP_ARG_VAL(session_only, 0)
-PHP_HTTP_END_ARGS;
-PHP_HTTP_EMPTY_ARGS(flushCookies);
-
-PHP_HTTP_EMPTY_ARGS(getResponseMessageClass);
-PHP_HTTP_BEGIN_ARGS(setResponseMessageClass, 1)
- PHP_HTTP_ARG_VAL(message_class_name, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(getResponseMessage);
-PHP_HTTP_EMPTY_ARGS(getRequestMessage);
-PHP_HTTP_EMPTY_ARGS(getHistory);
-PHP_HTTP_EMPTY_ARGS(clearHistory);
-
-PHP_HTTP_BEGIN_ARGS(setRequest, 1)
- PHP_HTTP_ARG_OBJ(http\\Client\\Request, request, 1)
-PHP_HTTP_END_ARGS;
-PHP_HTTP_EMPTY_ARGS(getRequest);
-
-PHP_HTTP_EMPTY_ARGS(getObservers);
-PHP_HTTP_BEGIN_ARGS(attach, 1)
- PHP_HTTP_ARG_OBJ(SplObserver, observer, 0)
-PHP_HTTP_END_ARGS;
-PHP_HTTP_BEGIN_ARGS(detach, 1)
- PHP_HTTP_ARG_OBJ(SplObserver, observer, 0)
-PHP_HTTP_END_ARGS;
-PHP_HTTP_EMPTY_ARGS(notify);
-PHP_HTTP_EMPTY_ARGS(getProgress);
-PHP_HTTP_BEGIN_ARGS(getTransferInfo, 0)
- PHP_HTTP_ARG_VAL(name, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(request, 2)
- PHP_HTTP_ARG_VAL(method, 0)
- PHP_HTTP_ARG_VAL(url, 0)
- PHP_HTTP_ARG_ARR(headers, 1, 0)
- PHP_HTTP_ARG_VAL(body, 0)
- PHP_HTTP_ARG_ARR(options, 1, 0)
-PHP_HTTP_END_ARGS;
-
-static zend_class_entry *php_http_client_class_entry;
-
-zend_class_entry *php_http_client_get_class_entry(void)
-{
- return php_http_client_class_entry;
-}
-
-static zend_function_entry php_http_client_method_entry[] = {
- PHP_HTTP_CLIENT_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
- PHP_HTTP_CLIENT_ME(getObservers, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(notify, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(attach, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(detach, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(getProgress, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(getTransferInfo, ZEND_ACC_PUBLIC)
-
- PHP_HTTP_CLIENT_ME(setOptions, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(getOptions, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(setSslOptions, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(getSslOptions, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(addSslOptions, ZEND_ACC_PUBLIC)
-
- PHP_HTTP_CLIENT_ME(addCookies, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(getCookies, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(setCookies, ZEND_ACC_PUBLIC)
-
- PHP_HTTP_CLIENT_ME(enableCookies, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(resetCookies, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(flushCookies, ZEND_ACC_PUBLIC)
-
- PHP_HTTP_CLIENT_ME(setRequest, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(getRequest, ZEND_ACC_PUBLIC)
-
- PHP_HTTP_CLIENT_ME(getResponseMessage, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(getRequestMessage, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(getHistory, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(clearHistory, ZEND_ACC_PUBLIC)
-
- PHP_HTTP_CLIENT_ME(getResponseMessageClass, ZEND_ACC_PUBLIC)
- PHP_HTTP_CLIENT_ME(setResponseMessageClass, ZEND_ACC_PUBLIC)
-
- PHP_HTTP_CLIENT_ME(request, ZEND_ACC_PUBLIC)
-
- EMPTY_FUNCTION_ENTRY
-};
-
+zend_class_entry *php_http_client_class_entry;
static zend_object_handlers php_http_client_object_handlers;
-zend_object_handlers *php_http_client_get_object_handlers(void)
+void php_http_client_object_free(void *object TSRMLS_DC)
{
- return &php_http_client_object_handlers;
-}
-
-static php_http_client_ops_t php_http_client_user_ops = {
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- (php_http_new_t) php_http_client_object_new_ex,
- php_http_client_get_class_entry
-};
+ php_http_client_object_t *o = (php_http_client_object_t *) object;
-zend_object_value php_http_client_object_new(zend_class_entry *ce TSRMLS_DC)
-{
- return php_http_client_object_new_ex(ce, NULL, NULL TSRMLS_CC);
+ php_http_client_free(&o->client);
+ php_http_object_method_dtor(&o->notify);
+ php_http_object_method_free(&o->update);
+ zend_object_std_dtor((zend_object *) o TSRMLS_CC);
+ efree(o);
}
-zend_object_value php_http_client_object_new_ex(zend_class_entry *ce, php_http_client_t *r, php_http_client_object_t **ptr TSRMLS_DC)
+zend_object_value php_http_client_object_new_ex(zend_class_entry *ce, php_http_client_t *client, php_http_client_object_t **ptr TSRMLS_DC)
{
- zend_object_value ov;
php_http_client_object_t *o;
- o = ecalloc(1, sizeof(*o));
+ o = ecalloc(1, sizeof(php_http_client_object_t));
zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
object_properties_init((zend_object *) o, ce);
-
- ov.handle = zend_objects_store_put(o, NULL, php_http_client_object_free, NULL TSRMLS_CC);
- ov.handlers = &php_http_client_object_handlers;
- if (!(o->client = r)) {
- o->client = php_http_client_init(NULL, &php_http_client_user_ops, NULL, &ov TSRMLS_CC);
- }
+ o->client = client;
if (ptr) {
*ptr = o;
}
- return ov;
-}
-
-zend_object_value php_http_client_object_clone(zval *this_ptr TSRMLS_DC)
-{
- zend_object_value new_ov;
- php_http_client_object_t *new_obj, *old_obj = zend_object_store_get_object(this_ptr TSRMLS_CC);
-
- new_ov = php_http_client_object_new_ex(old_obj->zo.ce, php_http_client_copy(old_obj->client, NULL), &new_obj TSRMLS_CC);
- zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
-
- return new_ov;
-}
-
-void php_http_client_object_free(void *object TSRMLS_DC)
-{
- php_http_client_object_t *o = (php_http_client_object_t *) object;
+ o->zv.handle = zend_objects_store_put(o, NULL, php_http_client_object_free, NULL TSRMLS_CC);
+ o->zv.handlers = &php_http_client_object_handlers;
- php_http_client_free(&o->client);
- zend_object_std_dtor((zend_object *) o TSRMLS_CC);
- efree(o);
+ return o->zv;
}
-static inline zend_object_value php_http_client_object_message(zval *this_ptr, php_http_message_t *msg TSRMLS_DC)
+zend_object_value php_http_client_object_new(zend_class_entry *ce TSRMLS_DC)
{
- zend_object_value ov;
- zval *zcn = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("responseMessageClass"), 0 TSRMLS_CC);
- zend_class_entry *class_entry;
-
- if (Z_STRLEN_P(zcn)
- && (class_entry = zend_fetch_class(Z_STRVAL_P(zcn), Z_STRLEN_P(zcn), 0 TSRMLS_CC))
- && (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_object_new_ex, php_http_client_response_get_class_entry(), msg, NULL TSRMLS_CC))) {
- return ov;
- } else {
- return php_http_message_object_new_ex(php_http_client_response_get_class_entry(), msg, NULL TSRMLS_CC);
- }
+ return php_http_client_object_new_ex(ce, NULL, NULL TSRMLS_CC);
}
-STATUS php_http_client_object_handle_request(zval *zclient, zval **zreq TSRMLS_DC)
+static void handle_history(zval *zclient, php_http_message_t *request, php_http_message_t *response TSRMLS_DC)
{
- php_http_client_object_t *obj = zend_object_store_get_object(zclient TSRMLS_CC);
- php_http_client_progress_t *progress;
- zval *zoptions;
- HashTable options;
-
- /* do we have a valid request? */
- if (*zreq) {
- /* remember the request */
- zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("request"), *zreq TSRMLS_CC);
- } else {
- /* maybe a request is already set */
- *zreq = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("request"), 0 TSRMLS_CC);
-
- if (Z_TYPE_PP(zreq) != IS_OBJECT || !instanceof_function(Z_OBJCE_PP(zreq), php_http_client_request_get_class_entry() TSRMLS_CC)) {
- php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "The client does not have a valid request set");
- return FAILURE;
- }
- }
-
- /* reset request handle */
- php_http_client_reset(obj->client);
+ zval *new_hist, *old_hist = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), 0 TSRMLS_CC);
+ php_http_message_t *zipped = php_http_message_zip(response, request);
+ zend_object_value ov = php_http_message_object_new_ex(php_http_message_class_entry, zipped, NULL TSRMLS_CC);
- /* reset transfer info */
- zend_update_property_null(php_http_client_class_entry, zclient, ZEND_STRL("transferInfo") TSRMLS_CC);
+ MAKE_STD_ZVAL(new_hist);
+ ZVAL_OBJVAL(new_hist, ov, 0);
-
- /* set client options */
- zend_hash_init(&options, 0, NULL, ZVAL_PTR_DTOR, 0);
- zoptions = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("options"), 0 TSRMLS_CC);
- if (Z_TYPE_P(zoptions) == IS_ARRAY && zend_hash_num_elements(Z_ARRVAL_P(zoptions))) {
- php_array_merge(&options, Z_ARRVAL_P(zoptions), 1 TSRMLS_CC);
- }
- zoptions = zend_read_property(php_http_client_request_get_class_entry(), *zreq, ZEND_STRL("options"), 0 TSRMLS_CC);
- if (Z_TYPE_P(zoptions) == IS_ARRAY && zend_hash_num_elements(Z_ARRVAL_P(zoptions))) {
- php_array_merge(&options, Z_ARRVAL_P(zoptions), 1 TSRMLS_CC);
+ if (Z_TYPE_P(old_hist) == IS_OBJECT) {
+ php_http_message_object_prepend(new_hist, old_hist, 1 TSRMLS_CC);
}
- php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_SETTINGS, &options);
- zend_hash_destroy(&options);
-
- /* set progress callback */
- if (SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, &progress)) {
- if (!progress->callback) {
- php_http_client_progress_callback_t *callback = emalloc(sizeof(*callback));
- callback->type = PHP_HTTP_CLIENT_PROGRESS_CALLBACK_USER;
- callback->pass_state = 0;
- MAKE_STD_ZVAL(callback->func.user);
- array_init(callback->func.user);
- Z_ADDREF_P(zclient);
- add_next_index_zval(callback->func.user, zclient);
- add_next_index_stringl(callback->func.user, ZEND_STRL("notify"), 1);
-
- php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_CALLBACK, callback);
- }
- progress->state.info = "start";
- php_http_client_progress_notify(progress TSRMLS_CC);
- progress->state.started = 1;
- }
-
- return SUCCESS;
+ zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), new_hist TSRMLS_CC);
+ zval_ptr_dtor(&new_hist);
}
-
-STATUS php_http_client_object_handle_response(zval *zclient TSRMLS_DC)
+static ZEND_RESULT_CODE handle_response(void *arg, php_http_client_t *client, php_http_client_enqueue_t *e, php_http_message_t **response)
{
- php_http_client_object_t *obj = zend_object_store_get_object(zclient TSRMLS_CC);
- php_http_client_progress_t *progress;
+ zend_bool dequeue = 0;
+ zval zclient;
php_http_message_t *msg;
- zval *info;
-
- /* always fetch info */
- MAKE_STD_ZVAL(info);
- array_init(info);
- php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_TRANSFER_INFO, Z_ARRVAL_P(info));
- zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("transferInfo"), info TSRMLS_CC);
- zval_ptr_dtor(&info);
-
- if ((msg = obj->client->response.message)) {
- if (i_zend_is_true(zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("recordHistory"), 0 TSRMLS_CC))) {
- zval *new_hist, *old_hist = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), 0 TSRMLS_CC);
- php_http_message_t *zipped = php_http_message_zip(obj->client->response.message, obj->client->request.message);
- zend_object_value ov = php_http_client_object_message(zclient, zipped TSRMLS_CC);
-
- MAKE_STD_ZVAL(new_hist);
- ZVAL_OBJVAL(new_hist, ov, 0);
-
- if (Z_TYPE_P(old_hist) == IS_OBJECT) {
- php_http_message_object_prepend(new_hist, old_hist, 1 TSRMLS_CC);
- }
+ php_http_client_progress_state_t *progress;
+ TSRMLS_FETCH_FROM_CTX(client->ts);
- zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), new_hist TSRMLS_CC);
- zval_ptr_dtor(&new_hist);
- }
+ INIT_PZVAL(&zclient);
+ ZVAL_OBJVAL(&zclient, ((php_http_client_object_t*) arg)->zv, 0);
- /* update response info */
- if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, msg)) {
- zval *message;
+ if ((msg = *response)) {
+ php_http_message_object_t *msg_obj;
+ zval *info, *zresponse, *zrequest;
+ HashTable *info_ht;
- MAKE_STD_ZVAL(message);
- ZVAL_OBJVAL(message, php_http_client_object_message(zclient, msg TSRMLS_CC), 0);
- zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("responseMessage"), message TSRMLS_CC);
- zval_ptr_dtor(&message);
+ /* ensure the message is of type response (could be uninitialized in case of early error, like DNS) */
+ php_http_message_set_type(msg, PHP_HTTP_RESPONSE);
- obj->client->response.message = php_http_message_init(NULL, 0 TSRMLS_CC);
- } else {
- zend_update_property_null(php_http_client_class_entry, zclient, ZEND_STRL("responseMessage") TSRMLS_CC);
+ if (z_is_true(zend_read_property(php_http_client_class_entry, &zclient, ZEND_STRL("recordHistory"), 0 TSRMLS_CC))) {
+ handle_history(&zclient, e->request, *response TSRMLS_CC);
}
- } else {
- zend_update_property_null(php_http_client_class_entry, zclient, ZEND_STRL("responseMessage") TSRMLS_CC);
- }
-
- if ((msg = obj->client->request.message)) {
- if (PHP_HTTP_MESSAGE_TYPE(REQUEST, msg)) {
- zval *message;
-
- /* update the actual request message */
- MAKE_STD_ZVAL(message);
- ZVAL_OBJVAL(message, php_http_message_object_new_ex(php_http_message_get_class_entry(), msg, NULL TSRMLS_CC), 0);
- zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("requestMessage"), message TSRMLS_CC);
- zval_ptr_dtor(&message);
- obj->client->request.message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
- }
-
- if (SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, &progress)) {
- progress->state.info = "finished";
- progress->state.finished = 1;
- php_http_client_progress_notify(progress TSRMLS_CC);
- }
- php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_CALLBACK, NULL);
- return SUCCESS;
-}
+ /* hard detach, redirects etc. are in the history */
+ php_http_message_free(&msg->parent);
+ *response = NULL;
-void php_http_client_options_set(zval *this_ptr, zval *opts TSRMLS_DC)
-{
- php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
- HashPosition pos;
- zval *new_opts;
- zend_class_entry *this_ce = Z_OBJCE_P(getThis());
- zend_bool is_client = instanceof_function(this_ce, php_http_client_class_entry TSRMLS_CC);
+ MAKE_STD_ZVAL(zresponse);
+ ZVAL_OBJVAL(zresponse, php_http_message_object_new_ex(php_http_client_response_class_entry, msg, &msg_obj TSRMLS_CC), 0);
- MAKE_STD_ZVAL(new_opts);
- array_init(new_opts);
+ MAKE_STD_ZVAL(zrequest);
+ ZVAL_OBJVAL(zrequest, ((php_http_message_object_t *) e->opaque)->zv, 1);
- if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) {
- zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC);
- zval_ptr_dtor(&new_opts);
- } else {
- zval *old_opts, *add_opts, **opt;
+ php_http_message_object_prepend(zresponse, zrequest, 1 TSRMLS_CC);
- MAKE_STD_ZVAL(add_opts);
- array_init(add_opts);
- /* some options need extra attention -- thus cannot use array_merge() directly */
- FOREACH_KEYVAL(pos, opts, key, opt) {
- if (key.type == HASH_KEY_IS_STRING) {
-#define KEYMATCH(k, s) ((sizeof(s)==k.len) && !strcasecmp(k.str, s))
- if (Z_TYPE_PP(opt) == IS_ARRAY && (KEYMATCH(key, "ssl") || KEYMATCH(key, "cookies"))) {
- php_http_client_options_set_subr(getThis(), key.str, key.len, *opt, 0 TSRMLS_CC);
- } else if (is_client && (KEYMATCH(key, "recordHistory") || KEYMATCH(key, "responseMessageClass"))) {
- zend_update_property(this_ce, getThis(), key.str, key.len-1, *opt TSRMLS_CC);
- } else if (Z_TYPE_PP(opt) == IS_NULL) {
- old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
- if (Z_TYPE_P(old_opts) == IS_ARRAY) {
- zend_symtable_del(Z_ARRVAL_P(old_opts), key.str, key.len);
- }
- } else {
- Z_ADDREF_P(*opt);
- add_assoc_zval_ex(add_opts, key.str, key.len, *opt);
- }
- }
- }
-
- old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
- if (Z_TYPE_P(old_opts) == IS_ARRAY) {
- array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts));
- }
- array_join(Z_ARRVAL_P(add_opts), Z_ARRVAL_P(new_opts), 0, 0);
- zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC);
- zval_ptr_dtor(&new_opts);
- zval_ptr_dtor(&add_opts);
- }
-}
-
-void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zval *opts, int overwrite TSRMLS_DC)
-{
- if (overwrite || (opts && zend_hash_num_elements(Z_ARRVAL_P(opts)))) {
- zend_class_entry *this_ce = Z_OBJCE_P(getThis());
- zval *old_opts, *new_opts, **entry = NULL;
-
- MAKE_STD_ZVAL(new_opts);
- array_init(new_opts);
- old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
- if (Z_TYPE_P(old_opts) == IS_ARRAY) {
- array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts));
- }
+ MAKE_STD_ZVAL(info);
+ object_init(info);
+ info_ht = HASH_OF(info);
+ php_http_client_getopt(client, PHP_HTTP_CLIENT_OPT_TRANSFER_INFO, e->request, &info_ht);
+ zend_update_property(php_http_client_response_class_entry, zresponse, ZEND_STRL("transferInfo"), info TSRMLS_CC);
+ zval_ptr_dtor(&info);
- if (overwrite) {
- if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) {
- Z_ADDREF_P(opts);
- zend_symtable_update(Z_ARRVAL_P(new_opts), key, len, (void *) &opts, sizeof(zval *), NULL);
- } else {
- zend_symtable_del(Z_ARRVAL_P(new_opts), key, len);
- }
- } else if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) {
- if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) {
- array_join(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry), 0, 0);
- } else {
- Z_ADDREF_P(opts);
- zend_symtable_update(Z_ARRVAL_P(new_opts), key, len, (void *) &opts, sizeof(zval *), NULL);
+ zend_objects_store_add_ref_by_handle(msg_obj->zv.handle TSRMLS_CC);
+ zend_llist_add_element(&client->responses, &msg_obj);
+
+ if (e->closure.fci.size) {
+ zval *retval = NULL;
+ zend_error_handling zeh;
+
+ zend_fcall_info_argn(&e->closure.fci TSRMLS_CC, 1, &zresponse);
+ zend_replace_error_handling(EH_NORMAL, NULL, &zeh TSRMLS_CC);
+ zend_fcall_info_call(&e->closure.fci, &e->closure.fcc, &retval, NULL TSRMLS_CC);
+ zend_restore_error_handling(&zeh TSRMLS_CC);
+ zend_fcall_info_argn(&e->closure.fci TSRMLS_CC, 0);
+
+ if (retval) {
+ if (Z_TYPE_P(retval) == IS_BOOL) {
+ dequeue = Z_BVAL_P(retval);
+ }
+ zval_ptr_dtor(&retval);
}
}
- zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC);
- zval_ptr_dtor(&new_opts);
+ zval_ptr_dtor(&zresponse);
+ zval_ptr_dtor(&zrequest);
+ }
+
+ if (SUCCESS == php_http_client_getopt(client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, e->request, &progress)) {
+ progress->info = "finished";
+ progress->finished = 1;
+ client->callback.progress.func(client->callback.progress.arg, client, e, progress);
+ }
+
+ if (dequeue) {
+ php_http_client_dequeue(client, e->request);
}
+
+ return SUCCESS;
}
-void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value TSRMLS_DC)
+static void handle_progress(void *arg, php_http_client_t *client, php_http_client_enqueue_t *e, php_http_client_progress_state_t *progress)
{
- zend_class_entry *this_ce = Z_OBJCE_P(getThis());
- zval **options, *opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
+ zval *zrequest, *zprogress, *zclient, **args[2];
+ php_http_client_object_t *client_obj = arg;
+ zend_error_handling zeh;
+ TSRMLS_FETCH_FROM_CTX(client->ts);
+
+ MAKE_STD_ZVAL(zclient);
+ ZVAL_OBJVAL(zclient, client_obj->zv, 1);
+
+ MAKE_STD_ZVAL(zrequest);
+ ZVAL_OBJVAL(zrequest, ((php_http_message_object_t *) e->opaque)->zv, 1);
+ args[0] = &zrequest;
+
+ MAKE_STD_ZVAL(zprogress);
+ object_init(zprogress);
+ add_property_bool(zprogress, "started", progress->started);
+ add_property_bool(zprogress, "finished", progress->finished);
+ add_property_string(zprogress, "info", STR_PTR(progress->info), 1);
+ add_property_double(zprogress, "dltotal", progress->dl.total);
+ add_property_double(zprogress, "dlnow", progress->dl.now);
+ add_property_double(zprogress, "ultotal", progress->ul.total);
+ add_property_double(zprogress, "ulnow", progress->ul.now);
+ args[1] = &zprogress;
+
+ zend_replace_error_handling(EH_NORMAL, NULL, &zeh TSRMLS_CC);
+ php_http_object_method_call(&client_obj->notify, zclient, NULL, 2, args TSRMLS_CC);
+ zend_restore_error_handling(&zeh TSRMLS_CC);
+
+ zval_ptr_dtor(&zclient);
+ zval_ptr_dtor(&zrequest);
+ zval_ptr_dtor(&zprogress);
+}
- if ((Z_TYPE_P(opts) == IS_ARRAY) && (SUCCESS == zend_symtable_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) {
- RETVAL_ZVAL(*options, 1, 0);
- }
+static void response_dtor(void *data)
+{
+ php_http_message_object_t *msg_obj = *(php_http_message_object_t **) data;
+ TSRMLS_FETCH_FROM_CTX(msg_obj->message->ts);
+
+ zend_objects_store_del_ref_by_handle_ex(msg_obj->zv.handle, msg_obj->zv.handlers TSRMLS_CC);
}
-PHP_METHOD(HttpClient, __construct)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_construct, 0, 0, 0)
+ ZEND_ARG_INFO(0, driver)
+ ZEND_ARG_INFO(0, persistent_handle_id)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, __construct)
{
- with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
- zval *os, *opts = NULL;
+ char *driver_str = NULL, *persistent_handle_str = NULL;
+ int driver_len = 0, persistent_handle_len = 0;
+ php_http_client_driver_t driver;
+ php_resource_factory_t *rf = NULL;
+ php_http_client_object_t *obj;
+ zval *os;
+
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ss", &driver_str, &driver_len, &persistent_handle_str, &persistent_handle_len), invalid_arg, return);
+
+ if (SUCCESS != php_http_client_driver_get(driver_str, driver_len, &driver)) {
+ php_http_throw(unexpected_val, "Failed to locate \"%s\" client request handler", driver_str);
+ return;
+ }
MAKE_STD_ZVAL(os);
object_init_ex(os, spl_ce_SplObjectStorage);
zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), os TSRMLS_CC);
zval_ptr_dtor(&os);
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) {
- php_http_client_options_set(getThis(), opts TSRMLS_CC);
+ if (persistent_handle_len) {
+ char *name_str;
+ size_t name_len;
+ php_persistent_handle_factory_t *pf;
+
+ name_len = spprintf(&name_str, 0, "http\\Client\\%s", driver.name_str);
+ php_http_pretty_key(name_str + sizeof("http\\Client"), driver.name_len, 1, 1);
+
+ if ((pf = php_persistent_handle_concede(NULL , name_str, name_len, persistent_handle_str, persistent_handle_len, NULL, NULL TSRMLS_CC))) {
+ rf = php_resource_factory_init(NULL, php_persistent_handle_get_resource_factory_ops(), pf, (void (*)(void *)) php_persistent_handle_abandon);
+ }
+
+ efree(name_str);
}
- } end_error_handling();
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ php_http_expect(obj->client = php_http_client_init(NULL, driver.client_ops, rf, NULL TSRMLS_CC), runtime, return);
+
+ php_http_object_method_init(&obj->notify, getThis(), ZEND_STRL("notify") TSRMLS_CC);
+
+ obj->client->callback.response.func = handle_response;
+ obj->client->callback.response.arg = obj;
+ obj->client->callback.progress.func = handle_progress;
+ obj->client->callback.progress.arg = obj;
+
+ obj->client->responses.dtor = response_dtor;
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_reset, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, reset)
+{
+ php_http_client_object_t *obj;
+ php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
+
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ obj->iterator = 0;
+ php_http_client_reset(obj->client);
+
+ RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, getObservers)
+static HashTable *combined_options(zval *client, zval *request TSRMLS_DC)
{
- with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
- if (SUCCESS == zend_parse_parameters_none()) {
- RETVAL_PROP(php_http_client_class_entry, "observers");
+ HashTable *options;
+ int num_options = 0;
+ zval *z_roptions = NULL, *z_coptions = zend_read_property(php_http_client_class_entry, client, ZEND_STRL("options"), 0 TSRMLS_CC);
+
+ if (Z_TYPE_P(z_coptions) == IS_ARRAY) {
+ num_options = zend_hash_num_elements(Z_ARRVAL_P(z_coptions));
+ }
+ zend_call_method_with_0_params(&request, NULL, NULL, "getOptions", &z_roptions);
+ if (z_roptions && Z_TYPE_P(z_roptions) == IS_ARRAY) {
+ int num = zend_hash_num_elements(Z_ARRVAL_P(z_roptions));
+ if (num > num_options) {
+ num_options = num;
+ }
+ }
+ ALLOC_HASHTABLE(options);
+ ZEND_INIT_SYMTABLE_EX(options, num_options, 0);
+ if (Z_TYPE_P(z_coptions) == IS_ARRAY) {
+ array_copy(Z_ARRVAL_P(z_coptions), options);
+ }
+ if (z_roptions) {
+ if (Z_TYPE_P(z_roptions) == IS_ARRAY) {
+ array_join(Z_ARRVAL_P(z_roptions), options, 0, 0);
}
- } end_error_handling();
+ zval_ptr_dtor(&z_roptions);
+ }
+ return options;
}
-static int notify(zend_object_iterator *iter, void *puser TSRMLS_DC)
+static void msg_queue_dtor(php_http_client_enqueue_t *e)
{
- zval **observer = NULL;
+ php_http_message_object_t *msg_obj = e->opaque;
+ TSRMLS_FETCH_FROM_CTX(msg_obj->message->ts);
- iter->funcs->get_current_data(iter, &observer TSRMLS_CC);
- if (observer) {
- zval *retval;
+ zend_objects_store_del_ref_by_handle_ex(msg_obj->zv.handle, msg_obj->zv.handlers TSRMLS_CC);
+ zend_hash_destroy(e->options);
+ FREE_HASHTABLE(e->options);
- zend_call_method_with_1_params(observer, NULL, NULL, "update", &retval, puser);
- zval_ptr_dtor(&retval);
- return SUCCESS;
+ if (e->closure.fci.size) {
+ zval_ptr_dtor(&e->closure.fci.function_name);
+ if (e->closure.fci.object_ptr) {
+ zval_ptr_dtor(&e->closure.fci.object_ptr);
+ }
}
- return FAILURE;
}
-PHP_METHOD(HttpClient, notify)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_enqueue, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 0)
+ ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, enqueue)
{
- if (SUCCESS == zend_parse_parameters_none()) {
- zval *observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0 TSRMLS_CC);
+ zval *request;
+ zend_fcall_info fci = empty_fcall_info;
+ zend_fcall_info_cache fcc = empty_fcall_info_cache;
+ php_http_client_object_t *obj;
+ php_http_message_object_t *msg_obj;
+ php_http_client_enqueue_t q;
+
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|f", &request, php_http_client_request_class_entry, &fci, &fcc), invalid_arg, return);
+
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ msg_obj = zend_object_store_get_object(request TSRMLS_CC);
- if (Z_TYPE_P(observers) == IS_OBJECT) {
- Z_ADDREF_P(getThis());
- spl_iterator_apply(observers, notify, getThis() TSRMLS_CC);
- zval_ptr_dtor(&getThis());
+ if (php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
+ php_http_throw(bad_method_call, "Failed to enqueue request; request already in queue", NULL);
+ return;
+ }
+
+ q.request = msg_obj->message;
+ q.options = combined_options(getThis(), request TSRMLS_CC);
+ q.dtor = msg_queue_dtor;
+ q.opaque = msg_obj;
+ q.closure.fci = fci;
+ q.closure.fcc = fcc;
+
+ if (fci.size) {
+ Z_ADDREF_P(fci.function_name);
+ if (fci.object_ptr) {
+ Z_ADDREF_P(fci.object_ptr);
}
}
+ zend_objects_store_add_ref_by_handle(msg_obj->zv.handle TSRMLS_CC);
+
+ php_http_expect(SUCCESS == php_http_client_enqueue(obj->client, &q), runtime,
+ msg_queue_dtor(&q);
+ return;
+ );
+
RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, attach)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_dequeue, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, dequeue)
{
- zval *observer;
+ zval *request;
+ php_http_client_object_t *obj;
+ php_http_message_object_t *msg_obj;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &observer, spl_ce_SplObserver)) {
- zval *retval, *observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0 TSRMLS_CC);
- zend_call_method_with_1_params(&observers, NULL, NULL, "attach", &retval, observer);
- zval_ptr_dtor(&retval);
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, php_http_client_request_class_entry), invalid_arg, return);
+
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ msg_obj = zend_object_store_get_object(request TSRMLS_CC);
+
+ if (!php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
+ php_http_throw(bad_method_call, "Failed to dequeue request; request not in queue", NULL);
+ return;
}
+ php_http_expect(SUCCESS == php_http_client_dequeue(obj->client, msg_obj->message), runtime, return);
+
RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, detach)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_requeue, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 0)
+ ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, requeue)
{
- zval *observer;
+ zval *request;
+ zend_fcall_info fci = empty_fcall_info;
+ zend_fcall_info_cache fcc = empty_fcall_info_cache;
+ php_http_client_object_t *obj;
+ php_http_message_object_t *msg_obj;
+ php_http_client_enqueue_t q;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &observer, spl_ce_SplObserver)) {
- zval *retval, *observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0 TSRMLS_CC);
- zend_call_method_with_1_params(&observers, NULL, NULL, "detach", &retval, observer);
- zval_ptr_dtor(&retval);
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|f", &request, php_http_client_request_class_entry, &fci, &fcc), invalid_arg, return);
+
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ msg_obj = zend_object_store_get_object(request TSRMLS_CC);
+
+ if (php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
+ php_http_expect(SUCCESS == php_http_client_dequeue(obj->client, msg_obj->message), runtime, return);
+ }
+
+ q.request = msg_obj->message;
+ q.options = combined_options(getThis(), request TSRMLS_CC);
+ q.dtor = msg_queue_dtor;
+ q.opaque = msg_obj;
+ q.closure.fci = fci;
+ q.closure.fcc = fcc;
+
+ if (fci.size) {
+ Z_ADDREF_P(fci.function_name);
+ if (fci.object_ptr) {
+ Z_ADDREF_P(fci.object_ptr);
+ }
}
+ zend_objects_store_add_ref_by_handle(msg_obj->zv.handle TSRMLS_CC);
+
+ php_http_expect(SUCCESS == php_http_client_enqueue(obj->client, &q), runtime,
+ msg_queue_dtor(&q);
+ return;
+ );
+
RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, getProgress)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_count, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, count)
{
- if (SUCCESS == zend_parse_parameters_none()) {
+ long count_mode = -1;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &count_mode)) {
php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- php_http_client_progress_t *progress = NULL;
-
- if (SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, &progress)) {
- object_init(return_value);
- add_property_bool(return_value, "started", progress->state.started);
- add_property_bool(return_value, "finished", progress->state.finished);
- add_property_string(return_value, "info", STR_PTR(progress->state.info), 1);
- add_property_double(return_value, "dltotal", progress->state.dl.total);
- add_property_double(return_value, "dlnow", progress->state.dl.now);
- add_property_double(return_value, "ultotal", progress->state.ul.total);
- add_property_double(return_value, "ulnow", progress->state.ul.now);
- }
+
+ RETVAL_LONG(zend_llist_count(&obj->client->requests));
}
}
-PHP_METHOD(HttpClient, getTransferInfo)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getResponse, 0, 0, 0)
+ ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, getResponse)
{
- char *info_name = NULL;
- int info_len = 0;
+ zval *zrequest = NULL;
+ php_http_client_object_t *obj;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &info_name, &info_len)) {
- zval **infop, *temp = NULL, *info = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("transferInfo"), 0 TSRMLS_CC);
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O", &zrequest, php_http_client_request_class_entry), invalid_arg, return);
- /* request completed? */
- if (Z_TYPE_P(info) != IS_ARRAY) {
- php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- MAKE_STD_ZVAL(temp);
- array_init(temp);
- php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_TRANSFER_INFO, Z_ARRVAL_P(temp));
- info = temp;
- }
+ if (zrequest) {
+ /* lookup the response with the request */
+ zend_llist_element *el = NULL;
+ php_http_message_object_t *req_obj = zend_object_store_get_object(zrequest TSRMLS_CC);
- if (info_len && info_name) {
- if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(info), php_http_pretty_key(info_name, info_len, 0, 0), info_len + 1, (void *) &infop)) {
- RETVAL_ZVAL(*infop, 1, 0);
- } else {
- php_http_error(HE_NOTICE, PHP_HTTP_E_INVALID_PARAM, "Could not find transfer info named %s", info_name);
- RETVAL_FALSE;
+ for (el = obj->client->responses.head; el; el = el->next) {
+ php_http_message_object_t *response_obj = *(php_http_message_object_t **) el->data;
+
+ if (response_obj->message->parent == req_obj->message) {
+ RETURN_OBJVAL(response_obj->zv, 1);
}
- } else {
- RETVAL_ZVAL(info, 1, 0);
}
- if (temp) {
- zval_ptr_dtor(&temp);
- }
+ /* not found for the request! */
+ php_http_throw(unexpected_val, "Could not find response for the request", NULL);
return;
}
- RETURN_FALSE;
+
+ /* pop off the last response */
+ if (obj->client->responses.tail) {
+ php_http_message_object_t *response_obj = *(php_http_message_object_t **) obj->client->responses.tail->data;
+
+ /* pop off and go */
+ if (response_obj) {
+ RETVAL_OBJVAL(response_obj->zv, 1);
+ zend_llist_remove_tail(&obj->client->responses);
+ }
+ }
}
-PHP_METHOD(HttpClient, setOptions)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getHistory, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, getHistory)
{
- zval *opts = NULL;
+ zval *zhistory;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) {
- php_http_client_options_set(getThis(), opts TSRMLS_CC);
+ php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
- RETVAL_ZVAL(getThis(), 1, 0);
- }
+ zhistory = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("history"), 0 TSRMLS_CC);
+ RETVAL_ZVAL(zhistory, 1, 0);
}
-PHP_METHOD(HttpClient, getOptions)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_send, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, send)
{
- if (SUCCESS == zend_parse_parameters_none()) {
- RETURN_PROP(php_http_client_class_entry, "options");
- }
- RETURN_FALSE;
+ php_http_client_object_t *obj;
+
+ php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
+
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ php_http_expect(SUCCESS == php_http_client_exec(obj->client), runtime, return);
+
+ RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, setSslOptions)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_once, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, once)
{
- 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);
+ if (SUCCESS == zend_parse_parameters_none()) {
+ php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- RETVAL_ZVAL(getThis(), 1, 0);
+ RETURN_BOOL(0 < php_http_client_once(obj->client));
}
}
-PHP_METHOD(HttpClient, addSslOptions)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_wait, 0, 0, 0)
+ ZEND_ARG_INFO(0, timeout)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, wait)
{
- zval *opts = NULL;
+ double timeout = 0;
- 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);
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|d", &timeout)) {
+ struct timeval timeout_val;
+ php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ timeout_val.tv_sec = (time_t) timeout;
+ timeout_val.tv_usec = PHP_HTTP_USEC(timeout) % PHP_HTTP_MCROSEC;
- RETVAL_ZVAL(getThis(), 1, 0);
+ RETURN_BOOL(SUCCESS == php_http_client_wait(obj->client, timeout > 0 ? &timeout_val : NULL));
}
}
-PHP_METHOD(HttpClient, getSslOptions)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_configure, 0, 0, 1)
+ ZEND_ARG_ARRAY_INFO(0, settings, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, configure)
{
- if (SUCCESS == zend_parse_parameters_none()) {
- php_http_client_options_get_subr(getThis(), ZEND_STRS("ssl"), return_value TSRMLS_CC);
- }
+ HashTable *settings = NULL;
+ php_http_client_object_t *obj;
+
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H!", &settings), invalid_arg, return);
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ php_http_expect(SUCCESS == php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_CONFIGURATION, settings), unexpected_val, return);
+
+ RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, setCookies)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_enablePipelining, 0, 0, 0)
+ ZEND_ARG_INFO(0, enable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, enablePipelining)
{
- zval *opts = NULL;
+ zend_bool enable = 1;
+ php_http_client_object_t *obj;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) {
- php_http_client_options_set_subr(getThis(), ZEND_STRS("cookies"), opts, 1 TSRMLS_CC);
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable), invalid_arg, return);
- RETVAL_ZVAL(getThis(), 1, 0);
- }
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ php_http_expect(SUCCESS == php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_ENABLE_PIPELINING, &enable), unexpected_val, return);
+
+ RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, addCookies)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_enableEvents, 0, 0, 0)
+ ZEND_ARG_INFO(0, enable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, enableEvents)
{
- zval *opts = NULL;
+ zend_bool enable = 1;
+ php_http_client_object_t *obj;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) {
- php_http_client_options_set_subr(getThis(), ZEND_STRS("cookies"), opts, 0 TSRMLS_CC);
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable), invalid_arg, return);
- RETVAL_ZVAL(getThis(), 1, 0);
- }
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ php_http_expect(SUCCESS == php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_USE_EVENTS, &enable), unexpected_val, return);
+
+ RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, getCookies)
+struct notify_arg {
+ php_http_object_method_t *cb;
+ zval **args[3];
+ int argc;
+};
+
+static int notify(zend_object_iterator *iter, void *puser TSRMLS_DC)
{
- if (SUCCESS == zend_parse_parameters_none()) {
- php_http_client_options_get_subr(getThis(), ZEND_STRS("cookies"), return_value TSRMLS_CC);
+ zval **observer = NULL;
+ struct notify_arg *arg = puser;
+
+ iter->funcs->get_current_data(iter, &observer TSRMLS_CC);
+ if (observer) {
+ return php_http_object_method_call(arg->cb, *observer, NULL, arg->argc, arg->args TSRMLS_CC);
}
+ return FAILURE;
}
-PHP_METHOD(HttpClient, enableCookies)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_notify, 0, 0, 0)
+ ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, notify)
{
- if (SUCCESS == zend_parse_parameters_none()){
- php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ zval *request = NULL, *zprogress = NULL, *observers;
+ php_http_client_object_t *client_obj;
+ struct notify_arg arg = {NULL};
+
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O!o!", &request, php_http_client_request_class_entry, &zprogress), invalid_arg, return);
+
+ client_obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0 TSRMLS_CC);
- php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_COOKIES_ENABLE, NULL);
+ if (Z_TYPE_P(observers) != IS_OBJECT) {
+ php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+ return;
+ }
+
+ if (client_obj->update) {
+ arg.cb = client_obj->update;
+
+ Z_ADDREF_P(getThis());
+ arg.args[0] = &getThis();
+ arg.argc = 1;
+
+ if (request) {
+ Z_ADDREF_P(request);
+ arg.args[1] = &request;
+ arg.argc += 1;
+ }
+
+ if (zprogress) {
+ Z_ADDREF_P(zprogress);
+ arg.args[2] = &zprogress;
+ arg.argc += 1;
+ }
+
+ spl_iterator_apply(observers, notify, &arg TSRMLS_CC);
+
+ zval_ptr_dtor(&getThis());
+ if (request) {
+ zval_ptr_dtor(&request);
+ }
+ if (zprogress) {
+ zval_ptr_dtor(&zprogress);
+ }
}
+
RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, resetCookies)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_attach, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, observer, SplObserver, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, attach)
{
- zend_bool session_only = 0;
+ zval *observers, *observer, *retval = NULL;
+ php_http_client_object_t *client_obj;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &session_only)) {
- php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (session_only) {
- php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_COOKIES_RESET_SESSION, NULL);
- } else {
- php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_COOKIES_RESET, NULL);
- }
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &observer, spl_ce_SplObserver), invalid_arg, return);
+
+ client_obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0 TSRMLS_CC);
+
+ if (Z_TYPE_P(observers) != IS_OBJECT) {
+ php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+ return;
+ }
+
+ if (!client_obj->update) {
+ client_obj->update = php_http_object_method_init(NULL, observer, ZEND_STRL("update") TSRMLS_CC);
}
+
+ zend_call_method_with_1_params(&observers, NULL, NULL, "attach", &retval, observer);
+ if (retval) {
+ zval_ptr_dtor(&retval);
+ }
+
RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, flushCookies)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_detach, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, observer, SplObserver, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, detach)
{
- if (SUCCESS == zend_parse_parameters_none()) {
- php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ zval *observers, *observer, *retval = NULL;
+
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &observer, spl_ce_SplObserver), invalid_arg, return);
+
+ observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0 TSRMLS_CC);
- php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_COOKIES_FLUSH, NULL);
+ if (Z_TYPE_P(observers) != IS_OBJECT) {
+ php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+ return;
+ }
+
+ zend_call_method_with_1_params(&observers, NULL, NULL, "detach", &retval, observer);
+ if (retval) {
+ zval_ptr_dtor(&retval);
}
+
RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, getResponseMessage)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getObservers, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, getObservers)
{
- with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
- if (SUCCESS == zend_parse_parameters_none()) {
- zval *message = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("responseMessage"), 0 TSRMLS_CC);
+ zval *observers;
- if (Z_TYPE_P(message) == IS_OBJECT) {
- RETVAL_OBJECT(message, 1);
- } else {
- php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "HttpClient does not contain a response message");
- }
- }
- } end_error_handling();
+ php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
+
+ observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0 TSRMLS_CC);
+
+ if (Z_TYPE_P(observers) != IS_OBJECT) {
+ php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+ return;
+ }
+
+ RETVAL_ZVAL(observers, 1, 0);
}
-PHP_METHOD(HttpClient, getRequestMessage)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getProgressInfo, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, getProgressInfo)
{
- with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
- if (SUCCESS == zend_parse_parameters_none()) {
- zval *message = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("requestMessage"), 0 TSRMLS_CC);
-
- if (Z_TYPE_P(message) == IS_OBJECT) {
- RETVAL_OBJECT(message, 1);
- } else {
- php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "HttpClient does not contain a request message");
- }
- }
- } end_error_handling();
+ zval *request;
+ php_http_client_object_t *obj;
+ php_http_message_object_t *req_obj;
+ php_http_client_progress_state_t *progress;
+
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, php_http_client_request_class_entry), invalid_arg, return);
+
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ req_obj = zend_object_store_get_object(request TSRMLS_CC);
+
+ php_http_expect(SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, req_obj->message, &progress), unexpected_val, return);
+
+ object_init(return_value);
+ add_property_bool(return_value, "started", progress->started);
+ add_property_bool(return_value, "finished", progress->finished);
+ add_property_string(return_value, "info", STR_PTR(progress->info), 1);
+ add_property_double(return_value, "dltotal", progress->dl.total);
+ add_property_double(return_value, "dlnow", progress->dl.now);
+ add_property_double(return_value, "ultotal", progress->ul.total);
+ add_property_double(return_value, "ulnow", progress->ul.now);
}
-PHP_METHOD(HttpClient, getHistory)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getTransferInfo, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, getTransferInfo)
{
- with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
- if (SUCCESS == zend_parse_parameters_none()) {
- zval *hist = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("history"), 0 TSRMLS_CC);
+ zval *request;
+ HashTable *info;
+ php_http_client_object_t *obj;
+ php_http_message_object_t *req_obj;
- if (Z_TYPE_P(hist) == IS_OBJECT) {
- RETVAL_OBJECT(hist, 1);
- } else {
- php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "The history is empty");
- }
- }
- } end_error_handling();
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, php_http_client_request_class_entry), invalid_arg, return);
+
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ req_obj = zend_object_store_get_object(request TSRMLS_CC);
+
+ object_init(return_value);
+ info = HASH_OF(return_value);
+ php_http_expect(SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_TRANSFER_INFO, req_obj->message, &info), unexpected_val, return);
}
-PHP_METHOD(HttpClient, clearHistory)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_setOptions, 0, 0, 0)
+ ZEND_ARG_ARRAY_INFO(0, options, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, setOptions)
{
- if (SUCCESS == zend_parse_parameters_none()) {
- zend_update_property_null(php_http_client_class_entry, getThis(), ZEND_STRL("history") TSRMLS_CC);
- }
+ zval *opts = NULL;
+
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return);
+
+ php_http_client_options_set(getThis(), opts TSRMLS_CC);
+
RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, getResponseMessageClass)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getOptions, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, getOptions)
{
if (SUCCESS == zend_parse_parameters_none()) {
- RETURN_PROP(php_http_client_class_entry, "responseMessageClass");
+ zval *options = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
+ RETVAL_ZVAL(options, 1, 0);
}
- RETURN_FALSE;
}
-PHP_METHOD(HttpClient, setResponseMessageClass)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_setSslOptions, 0, 0, 0)
+ ZEND_ARG_ARRAY_INFO(0, ssl_option, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, setSslOptions)
{
- char *cn;
- int cl;
+ zval *opts = NULL;
+
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return);
+
+ php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 1 TSRMLS_CC);
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &cn, &cl)) {
- zend_update_property_stringl(php_http_client_class_entry, getThis(), ZEND_STRL("responseMessageClass"), cn, cl TSRMLS_CC);
- }
RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, setRequest)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_addSslOptions, 0, 0, 0)
+ ZEND_ARG_ARRAY_INFO(0, ssl_options, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, addSslOptions)
{
- zval *zreq = NULL;
+ zval *opts = NULL;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zreq, php_http_client_request_get_class_entry())) {
- zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("request"), zreq TSRMLS_CC);
- }
- RETURN_ZVAL(getThis(), 1, 0);
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return);
+
+ php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 0 TSRMLS_CC);
+
+ RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, getRequest)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getSslOptions, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, getSslOptions)
{
if (SUCCESS == zend_parse_parameters_none()) {
- RETURN_PROP(php_http_client_class_entry, "request");
+ php_http_client_options_get_subr(getThis(), ZEND_STRS("ssl"), return_value TSRMLS_CC);
}
}
-PHP_METHOD(HttpClient, request)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_setCookies, 0, 0, 0)
+ ZEND_ARG_ARRAY_INFO(0, cookies, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, setCookies)
{
- char *meth_str, *url_str;
- int meth_len, url_len;
- zval *zheader, *zbody, *zoptions;
+ zval *opts = NULL;
- with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a!z!a!/", &meth_str, &meth_len, &url_str, &url_len, &zheader, &zbody, &zoptions)) {
- php_http_message_object_t *msg_obj;
- zend_object_value ov;
- zval *req, *res = NULL;
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return);
- php_http_new(&ov, php_http_client_request_get_class_entry(), (php_http_new_t) php_http_message_object_new_ex, NULL, NULL, (void *) &msg_obj TSRMLS_CC);
- MAKE_STD_ZVAL(req);
- ZVAL_OBJVAL(req, ov, 0);
+ php_http_client_options_set_subr(getThis(), ZEND_STRS("cookies"), opts, 1 TSRMLS_CC);
- msg_obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST TSRMLS_CC);
- PHP_HTTP_INFO(msg_obj->message).request.url = estrndup(url_str, url_len);
- PHP_HTTP_INFO(msg_obj->message).request.method = estrndup(meth_str, meth_len);
+ RETVAL_ZVAL(getThis(), 1, 0);
+}
- if (zheader) {
- array_copy(Z_ARRVAL_P(zheader), &msg_obj->message->hdrs);
- }
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_addCookies, 0, 0, 0)
+ ZEND_ARG_ARRAY_INFO(0, cookies, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, addCookies)
+{
+ zval *opts = NULL;
- if (zbody) {
- php_http_message_object_set_body(msg_obj, zbody TSRMLS_CC);
- }
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return);
- if (zoptions) {
- php_http_client_options_set(req, zoptions TSRMLS_CC);
- }
+ php_http_client_options_set_subr(getThis(), ZEND_STRS("cookies"), opts, 0 TSRMLS_CC);
- zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "send", &res, req);
- RETVAL_ZVAL(res, 0, 1);
- zval_ptr_dtor(&req);
- }
- } end_error_handling();
+ RETVAL_ZVAL(getThis(), 1, 0);
}
-PHP_METHOD(HttpClient, send)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getCookies, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, getCookies)
{
- zval *zreq = NULL;
+ if (SUCCESS == zend_parse_parameters_none()) {
+ php_http_client_options_get_subr(getThis(), ZEND_STRS("cookies"), return_value TSRMLS_CC);
+ }
+}
- RETVAL_FALSE;
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getAvailableDrivers, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, getAvailableDrivers) {
+ if (SUCCESS == zend_parse_parameters_none()) {
+ array_init(return_value);
+ php_http_client_driver_list(Z_ARRVAL_P(return_value) TSRMLS_CC);
+ }
+}
- with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O!", &zreq, php_http_client_request_get_class_entry())) {
- if (SUCCESS == php_http_client_object_handle_request(getThis(), &zreq TSRMLS_CC)) {
- php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- php_http_message_object_t *req = zend_object_store_get_object(zreq TSRMLS_CC);
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getAvailableOptions, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, getAvailableOptions)
+{
+ if (SUCCESS == zend_parse_parameters_none()) {
+ php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- php_http_client_exec(obj->client, req->message);
+ array_init(return_value);
+ php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_AVAILABLE_OPTIONS, NULL, &Z_ARRVAL_P(return_value));
+ }
+}
- if (SUCCESS == php_http_client_object_handle_response(getThis() TSRMLS_CC)) {
- RETVAL_PROP(php_http_client_class_entry, "responseMessage");
- } else {
- php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "Failed to handle response");
- }
- } else {
- php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "Failed to handle request");
- }
- }
- } end_error_handling();
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getAvailableConfiguration, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpClient, getAvailableConfiguration)
+{
+ if (SUCCESS == zend_parse_parameters_none()) {
+ php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ array_init(return_value);
+ php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_AVAILABLE_CONFIGURATION, NULL, &Z_ARRVAL_P(return_value));
+ }
}
+static zend_function_entry php_http_client_methods[] = {
+ PHP_ME(HttpClient, __construct, ai_HttpClient_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+ PHP_ME(HttpClient, reset, ai_HttpClient_reset, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, enqueue, ai_HttpClient_enqueue, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, dequeue, ai_HttpClient_dequeue, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, requeue, ai_HttpClient_requeue, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, count, ai_HttpClient_count, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, send, ai_HttpClient_send, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, once, ai_HttpClient_once, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, wait, ai_HttpClient_wait, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, getResponse, ai_HttpClient_getResponse, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, getHistory, ai_HttpClient_getHistory, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, configure, ai_HttpClient_configure, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, enablePipelining, ai_HttpClient_enablePipelining, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED)
+ PHP_ME(HttpClient, enableEvents, ai_HttpClient_enableEvents, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED)
+ PHP_ME(HttpClient, notify, ai_HttpClient_notify, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, attach, ai_HttpClient_attach, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, detach, ai_HttpClient_detach, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, getObservers, ai_HttpClient_getObservers, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, getProgressInfo, ai_HttpClient_getProgressInfo, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, getTransferInfo, ai_HttpClient_getTransferInfo, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, setOptions, ai_HttpClient_setOptions, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, getOptions, ai_HttpClient_getOptions, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, setSslOptions, ai_HttpClient_setSslOptions, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, addSslOptions, ai_HttpClient_addSslOptions, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, getSslOptions, ai_HttpClient_getSslOptions, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, setCookies, ai_HttpClient_setCookies, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, addCookies, ai_HttpClient_addCookies, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, getCookies, ai_HttpClient_getCookies, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, getAvailableDrivers, ai_HttpClient_getAvailableDrivers, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ PHP_ME(HttpClient, getAvailableOptions, ai_HttpClient_getAvailableOptions, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpClient, getAvailableConfiguration, ai_HttpClient_getAvailableConfiguration, ZEND_ACC_PUBLIC)
+ EMPTY_FUNCTION_ENTRY
+};
+
PHP_MINIT_FUNCTION(http_client)
{
- PHP_HTTP_REGISTER_CLASS(http\\Client, AbstractClient, http_client, php_http_object_get_class_entry(), ZEND_ACC_ABSTRACT);
+ zend_class_entry ce = {0};
+
+ INIT_NS_CLASS_ENTRY(ce, "http", "Client", php_http_client_methods);
+ php_http_client_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_http_client_class_entry->create_object = php_http_client_object_new;
+ zend_class_implements(php_http_client_class_entry TSRMLS_CC, 2, spl_ce_SplSubject, spl_ce_Countable);
memcpy(&php_http_client_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- php_http_client_object_handlers.clone_obj = php_http_client_object_clone;
-
- zend_class_implements(php_http_client_class_entry TSRMLS_CC, 2, spl_ce_SplSubject, php_http_client_interface_get_class_entry());
-
- zend_declare_property_string(php_http_client_class_entry, ZEND_STRL("responseMessageClass"), "", ZEND_ACC_PRIVATE TSRMLS_CC);
+ php_http_client_object_handlers.clone_obj = NULL;
zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("observers"), ZEND_ACC_PRIVATE TSRMLS_CC);
- zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("transferInfo"), ZEND_ACC_PRIVATE TSRMLS_CC);
- zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("responseMessage"), ZEND_ACC_PRIVATE TSRMLS_CC);
- zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("requestMessage"), ZEND_ACC_PRIVATE TSRMLS_CC);
- zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("history"), ZEND_ACC_PRIVATE TSRMLS_CC);
-
zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED TSRMLS_CC);
- zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("request"), ZEND_ACC_PROTECTED TSRMLS_CC);
-
+ zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("history"), ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_bool(php_http_client_class_entry, ZEND_STRL("recordHistory"), 0, ZEND_ACC_PUBLIC TSRMLS_CC);
+ zend_hash_init(&php_http_client_drivers, 2, NULL, NULL, 1);
+
+ return SUCCESS;
+}
+
+PHP_MSHUTDOWN_FUNCTION(http_client)
+{
+ zend_hash_destroy(&php_http_client_drivers);
return SUCCESS;
}
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
-
projects / m6w6 / ext-http / blobdiff