X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client.c;h=9551dd0bbe775f252a8893f090a17f06ddb5d36f;hp=5de1eac6dd2311a22bb5b175292f2186839220cf;hb=ba429472d56e45d8ce65d47ec0b5027f3bba4407;hpb=3db1f1fe45ab051a57f70f637618e02f7985406e diff --git a/src/php_http_client.c b/src/php_http_client.c index 5de1eac..9551dd0 100644 --- a/src/php_http_client.c +++ b/src/php_http_client.c @@ -13,7 +13,7 @@ #include "php_http_api.h" #include "php_http_client.h" -#include +#include "ext/spl/spl_observer.h" /* * array of name => php_http_client_driver_t* @@ -75,6 +75,7 @@ void php_http_client_options_set_subr(zval *instance, char *key, size_t len, zva array_init(&new_opts); old_opts = zend_read_property(this_ce, instance, ZEND_STRL("options"), 0, &old_opts_tmp); + if (Z_TYPE_P(old_opts) == IS_ARRAY) { array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL(new_opts)); } @@ -88,6 +89,7 @@ void php_http_client_options_set_subr(zval *instance, char *key, size_t len, zva } } else if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) { if ((entry = zend_symtable_str_find(Z_ARRVAL(new_opts), key, len))) { + SEPARATE_ZVAL(entry); array_join(Z_ARRVAL_P(opts), Z_ARRVAL_P(entry), 0, 0); } else { Z_ADDREF_P(opts); @@ -211,6 +213,8 @@ void php_http_client_dtor(php_http_client_t *h) if (h->ops->dtor) { h->ops->dtor(h); } + h->callback.debug.func = NULL; + h->callback.debug.arg = NULL; php_resource_factory_free(&h->rf); } @@ -330,7 +334,14 @@ void php_http_client_object_free(zend_object *object) { php_http_client_object_t *o = PHP_HTTP_OBJ(object, NULL); + PTR_FREE(o->gc); + php_http_client_free(&o->client); + if (o->debug.fci.size > 0) { + zend_fcall_info_args_clear(&o->debug.fci, 1); + zval_ptr_dtor(&o->debug.fci.function_name); + o->debug.fci.size = 0; + } php_http_object_method_dtor(&o->notify); php_http_object_method_free(&o->update); zend_object_std_dtor(object); @@ -356,6 +367,54 @@ zend_object *php_http_client_object_new(zend_class_entry *ce) return &php_http_client_object_new_ex(ce, NULL)->zo; } +static HashTable *php_http_client_object_get_gc(zval *object, zval **table, int *n) +{ + php_http_client_object_t *obj = PHP_HTTP_OBJ(NULL, object); + zend_llist_element *el = NULL; + HashTable *props = Z_OBJPROP_P(object); + uint32_t count = zend_hash_num_elements(props) + zend_llist_count(&obj->client->responses) + zend_llist_count(&obj->client->requests) + 2; + zval *val; + + *n = 0; + *table = obj->gc = erealloc(obj->gc, sizeof(zval) * count); + +#if PHP_HTTP_HAVE_LIBCURL + if (obj->client->ops == php_http_client_curl_get_ops()) { + php_http_client_curl_t *curl = obj->client->ctx; + + if (curl->ev_ops == php_http_client_curl_user_ops_get()) { + php_http_client_curl_user_context_t *ctx = curl->ev_ctx; + + ZVAL_COPY_VALUE(&obj->gc[(*n)++], &ctx->user); + } + } +#endif + + if (obj->debug.fci.size > 0) { + ZVAL_COPY_VALUE(&obj->gc[(*n)++], &obj->debug.fci.function_name); + } + + for (el = obj->client->responses.head; el; el = el->next) { + php_http_message_object_t *response_obj = *(php_http_message_object_t **) el->data; + ZVAL_OBJ(&obj->gc[(*n)++], &response_obj->zo); + } + + for (el = obj->client->requests.head; el; el = el->next) { + php_http_client_enqueue_t *q = (php_http_client_enqueue_t *) el->data; + if (q->request_obj) { + ZVAL_OBJ(&obj->gc[(*n)++], &q->request_obj->zo); + } + } + + ZEND_HASH_FOREACH_VAL(props, val) + { + ZVAL_COPY_VALUE(&obj->gc[(*n)++], val); + } + ZEND_HASH_FOREACH_END(); + + return NULL; +} + static void handle_history(zval *zclient, php_http_message_t *request, php_http_message_t *response) { zval new_hist, old_hist_tmp, *old_hist = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), 0, &old_hist_tmp); @@ -400,7 +459,7 @@ static ZEND_RESULT_CODE handle_response(void *arg, php_http_client_t *client, ph *response = NULL; msg_obj = php_http_message_object_new_ex(php_http_get_client_response_class_entry(), msg); - ZVAL_OBJ(&zresponse, &msg_obj->zo); + ZVAL_OBJECT(&zresponse, &msg_obj->zo, 1); ZVAL_OBJECT(&zrequest, &((php_http_message_object_t *) e->opaque)->zo, 1); php_http_message_object_prepend(&zresponse, &zrequest, 1); @@ -411,7 +470,6 @@ static ZEND_RESULT_CODE handle_response(void *arg, php_http_client_t *client, ph zend_update_property(php_http_get_client_response_class_entry(), &zresponse, ZEND_STRL("transferInfo"), &info); zval_ptr_dtor(&info); - Z_ADDREF(zresponse); zend_llist_add_element(&client->responses, &msg_obj); if (e->closure.fci.size) { @@ -421,7 +479,9 @@ static ZEND_RESULT_CODE handle_response(void *arg, php_http_client_t *client, ph ZVAL_UNDEF(&retval); zend_fcall_info_argn(&e->closure.fci, 1, &zresponse); zend_replace_error_handling(EH_NORMAL, NULL, &zeh); + ++client->callback.depth; zend_fcall_info_call(&e->closure.fci, &e->closure.fcc, &retval, NULL); + --client->callback.depth; zend_restore_error_handling(&zeh); zend_fcall_info_argn(&e->closure.fci, 0); @@ -466,7 +526,9 @@ static void handle_progress(void *arg, php_http_client_t *client, php_http_clien add_property_double(&args[1], "ulnow", progress->ul.now); zend_replace_error_handling(EH_NORMAL, NULL, &zeh); + ++client->callback.depth; php_http_object_method_call(&client_obj->notify, &zclient, NULL, 2, args); + --client->callback.depth; zend_restore_error_handling(&zeh); zval_ptr_dtor(&zclient); @@ -474,11 +536,37 @@ static void handle_progress(void *arg, php_http_client_t *client, php_http_clien zval_ptr_dtor(&args[1]); } +static void handle_debug(void *arg, php_http_client_t *client, php_http_client_enqueue_t *e, unsigned type, const char *data, size_t size) +{ + zval ztype, zdata, zreq, zclient; + php_http_client_object_t *client_obj = arg; + zend_error_handling zeh; + + ZVAL_OBJECT(&zclient, &client_obj->zo, 1); + ZVAL_OBJECT(&zreq, &((php_http_message_object_t *) e->opaque)->zo, 1); + ZVAL_LONG(&ztype, type); + ZVAL_STRINGL(&zdata, data, size); + + zend_replace_error_handling(EH_NORMAL, NULL, &zeh); + if (SUCCESS == zend_fcall_info_argn(&client_obj->debug.fci, 4, &zclient, &zreq, &ztype, &zdata)) { + ++client->callback.depth; + zend_fcall_info_call(&client_obj->debug.fci, &client_obj->debug.fcc, NULL, NULL); + --client->callback.depth; + zend_fcall_info_args_clear(&client_obj->debug.fci, 0); + } + zend_restore_error_handling(&zeh); + + zval_ptr_dtor(&zclient); + zval_ptr_dtor(&zreq); + zval_ptr_dtor(&ztype); + zval_ptr_dtor(&zdata); +} + static void response_dtor(void *data) { php_http_message_object_t *msg_obj = *(php_http_message_object_t **) data; - zend_objects_store_del(&msg_obj->zo); + zend_object_release(&msg_obj->zo); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_construct, 0, 0, 0) @@ -496,7 +584,7 @@ static PHP_METHOD(HttpClient, __construct) php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|S!S!", &driver_name, &persistent_handle_name), invalid_arg, return); if (!zend_hash_num_elements(&php_http_client_drivers)) { - php_http_throw(unexpected_val, "No http\\Client drivers available", NULL); + php_http_throw(unexpected_val, "No http\\Client drivers available"); return; } if (!(driver = php_http_client_driver_get(driver_name))) { @@ -579,14 +667,14 @@ static void msg_queue_dtor(php_http_client_enqueue_t *e) { php_http_message_object_t *msg_obj = e->opaque; - zend_objects_store_del(&msg_obj->zo); + zend_object_release(&msg_obj->zo); zend_hash_destroy(e->options); FREE_HASHTABLE(e->options); if (e->closure.fci.size) { zval_ptr_dtor(&e->closure.fci.function_name); if (e->closure.fci.object) { - zend_objects_store_del(e->closure.fci.object); + zend_object_release(e->closure.fci.object); } } } @@ -602,7 +690,7 @@ static PHP_METHOD(HttpClient, enqueue) 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_client_enqueue_t q = {0}; php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O|f", &request, php_http_get_client_request_class_entry(), &fci, &fcc), invalid_arg, return); @@ -610,10 +698,21 @@ static PHP_METHOD(HttpClient, enqueue) msg_obj = PHP_HTTP_OBJ(NULL, request); 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); + php_http_throw(bad_method_call, "Failed to enqueue request; request already in queue"); return; } + /* set early for progress callback */ + q.opaque = msg_obj; + + if (obj->client->callback.progress.func) { + php_http_client_progress_state_t progress = {0}; + + progress.info = "prepare"; + obj->client->callback.progress.func(obj->client->callback.progress.arg, obj->client, &q, &progress); + } + + Z_ADDREF_P(request); q.request = msg_obj->message; q.options = combined_options(getThis(), request); q.dtor = msg_queue_dtor; @@ -624,12 +723,10 @@ static PHP_METHOD(HttpClient, enqueue) if (fci.size) { Z_TRY_ADDREF(fci.function_name); if (fci.object) { - ++GC_REFCOUNT(fci.object); + GC_ADDREF(fci.object); } } - Z_ADDREF_P(request); - php_http_expect(SUCCESS == php_http_client_enqueue(obj->client, &q), runtime, msg_queue_dtor(&q); return; @@ -653,7 +750,7 @@ static PHP_METHOD(HttpClient, dequeue) msg_obj = PHP_HTTP_OBJ(NULL, request); 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); + php_http_throw(bad_method_call, "Failed to dequeue request; request not in queue"); return; } @@ -694,7 +791,7 @@ static PHP_METHOD(HttpClient, requeue) if (fci.size) { Z_TRY_ADDREF(fci.function_name); if (fci.object) { - ++GC_REFCOUNT(fci.object); + GC_ADDREF(fci.object); } } @@ -747,7 +844,7 @@ static PHP_METHOD(HttpClient, getResponse) } /* not found for the request! */ - php_http_throw(unexpected_val, "Could not find response for the request", NULL); + php_http_throw(unexpected_val, "Could not find response for the request"); return; } @@ -890,6 +987,7 @@ static int notify(zend_object_iterator *iter, void *puser) ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_notify, 0, 0, 0) ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 1) + ZEND_ARG_INFO(0, progress) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, notify) { @@ -903,7 +1001,7 @@ static PHP_METHOD(HttpClient, notify) observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp); if (Z_TYPE_P(observers) != IS_OBJECT) { - php_http_throw(unexpected_val, "Observer storage is corrupted", NULL); + php_http_throw(unexpected_val, "Observer storage is corrupted"); return; } @@ -949,7 +1047,7 @@ static PHP_METHOD(HttpClient, attach) observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp); if (Z_TYPE_P(observers) != IS_OBJECT) { - php_http_throw(unexpected_val, "Observer storage is corrupted", NULL); + php_http_throw(unexpected_val, "Observer storage is corrupted"); return; } @@ -976,7 +1074,7 @@ static PHP_METHOD(HttpClient, detach) observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp); if (Z_TYPE_P(observers) != IS_OBJECT) { - php_http_throw(unexpected_val, "Observer storage is corrupted", NULL); + php_http_throw(unexpected_val, "Observer storage is corrupted"); return; } @@ -998,7 +1096,7 @@ static PHP_METHOD(HttpClient, getObservers) observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp); if (Z_TYPE_P(observers) != IS_OBJECT) { - php_http_throw(unexpected_val, "Observer storage is corrupted", NULL); + php_http_throw(unexpected_val, "Observer storage is corrupted"); return; } @@ -1184,8 +1282,41 @@ static PHP_METHOD(HttpClient, getAvailableConfiguration) } } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_setDebug, 0, 0, 1) + /* using IS_CALLABLE type hint would create a forwards compatibility break */ + ZEND_ARG_INFO(0, callback) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpClient, setDebug) +{ + zend_fcall_info fci; + zend_fcall_info_cache fcc; + php_http_client_object_t *client_obj; + + fci.size = 0; + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|f", &fci, &fcc), invalid_arg, return); + + client_obj = PHP_HTTP_OBJ(NULL, getThis()); + + if (client_obj->debug.fci.size > 0) { + zval_ptr_dtor(&client_obj->debug.fci.function_name); + client_obj->debug.fci.size = 0; + } + if (fci.size > 0) { + memcpy(&client_obj->debug.fci, &fci, sizeof(fci)); + memcpy(&client_obj->debug.fcc, &fcc, sizeof(fcc)); + Z_ADDREF_P(&fci.function_name); + client_obj->client->callback.debug.func = handle_debug; + client_obj->client->callback.debug.arg = client_obj; + } else { + client_obj->client->callback.debug.func = NULL; + client_obj->client->callback.debug.arg = NULL; + } + + RETVAL_ZVAL(getThis(), 1, 0); +} + static zend_function_entry php_http_client_methods[] = { - PHP_ME(HttpClient, __construct, ai_HttpClient_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(HttpClient, __construct, ai_HttpClient_construct, ZEND_ACC_PUBLIC) 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) @@ -1216,6 +1347,7 @@ static zend_function_entry php_http_client_methods[] = { 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) + PHP_ME(HttpClient, setDebug, ai_HttpClient_setDebug, ZEND_ACC_PUBLIC) EMPTY_FUNCTION_ENTRY }; @@ -1231,11 +1363,19 @@ PHP_MINIT_FUNCTION(http_client) php_http_client_object_handlers.offset = XtOffsetOf(php_http_client_object_t, zo); php_http_client_object_handlers.free_obj = php_http_client_object_free; php_http_client_object_handlers.clone_obj = NULL; + php_http_client_object_handlers.get_gc = php_http_client_object_get_gc; zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("observers"), ZEND_ACC_PRIVATE); zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED); zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("history"), ZEND_ACC_PROTECTED); zend_declare_property_bool(php_http_client_class_entry, ZEND_STRL("recordHistory"), 0, ZEND_ACC_PUBLIC); + zend_declare_class_constant_long(php_http_client_class_entry, ZEND_STRL("DEBUG_INFO"), PHP_HTTP_CLIENT_DEBUG_INFO); + zend_declare_class_constant_long(php_http_client_class_entry, ZEND_STRL("DEBUG_IN"), PHP_HTTP_CLIENT_DEBUG_IN); + zend_declare_class_constant_long(php_http_client_class_entry, ZEND_STRL("DEBUG_OUT"), PHP_HTTP_CLIENT_DEBUG_OUT); + zend_declare_class_constant_long(php_http_client_class_entry, ZEND_STRL("DEBUG_HEADER"), PHP_HTTP_CLIENT_DEBUG_HEADER); + zend_declare_class_constant_long(php_http_client_class_entry, ZEND_STRL("DEBUG_BODY"), PHP_HTTP_CLIENT_DEBUG_BODY); + zend_declare_class_constant_long(php_http_client_class_entry, ZEND_STRL("DEBUG_SSL"), PHP_HTTP_CLIENT_DEBUG_SSL); + zend_hash_init(&php_http_client_drivers, 2, NULL, php_http_client_driver_hash_dtor, 1); return SUCCESS;