X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client.c;h=cedc239b68c1f780c2df5ef7b46b5bf74f448992;hp=5d78803154676f52248647338ffb463c88ce82ac;hb=3ee3d5f53712e1e91d4ffef34aa0c6e8f4f8840e;hpb=57e944b102006abfa4005337b0ac5901425f4289

diff --git a/src/php_http_client.c b/src/php_http_client.c
index 5d78803..cedc239 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 <ext/spl/spl_observer.h>
+#include "ext/spl/spl_observer.h"
 
 /*
  * array of name => php_http_client_driver_t*
@@ -61,6 +61,12 @@ void php_http_client_driver_list(HashTable *ht)
 	zend_hash_apply_with_argument(&php_http_client_drivers, apply_driver_list, ht);
 }
 
+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;
+}
+
 void php_http_client_options_set_subr(zval *instance, char *key, size_t len, zval *opts, int overwrite)
 {
 	if (overwrite || (opts && zend_hash_num_elements(Z_ARRVAL_P(opts)))) {
@@ -69,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));
 		}
@@ -82,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);
@@ -205,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);
 }
@@ -318,14 +328,20 @@ ZEND_RESULT_CODE php_http_client_getopt(php_http_client_t *h, php_http_client_ge
 	return FAILURE;
 }
 
-zend_class_entry *php_http_client_class_entry;
 static zend_object_handlers php_http_client_object_handlers;
 
 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);
@@ -351,13 +367,60 @@ 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;
+		php_http_message_object_t *request_obj = q->opaque; /* FIXME */
+		ZVAL_OBJ(&obj->gc[(*n)++], &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);
 	php_http_message_t *req_copy = php_http_message_copy(request, NULL);
 	php_http_message_t *res_copy = php_http_message_copy(response, NULL);
 	php_http_message_t *zipped = php_http_message_zip(res_copy, req_copy);
-	php_http_message_object_t *obj = php_http_message_object_new_ex(php_http_message_class_entry, zipped);
+	php_http_message_object_t *obj = php_http_message_object_new_ex(php_http_message_get_class_entry(), zipped);
 
 	ZVAL_OBJ(&new_hist, &obj->zo);
 
@@ -394,8 +457,8 @@ static ZEND_RESULT_CODE handle_response(void *arg, php_http_client_t *client, ph
 		php_http_message_free(&msg->parent);
 		*response = NULL;
 
-		msg_obj = php_http_message_object_new_ex(php_http_client_response_class_entry, msg);
-		ZVAL_OBJ(&zresponse, &msg_obj->zo);
+		msg_obj = php_http_message_object_new_ex(php_http_get_client_response_class_entry(), msg);
+		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);
@@ -403,10 +466,9 @@ static ZEND_RESULT_CODE handle_response(void *arg, php_http_client_t *client, ph
 		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);
+		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) {
@@ -416,7 +478,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);
 
@@ -461,7 +525,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);
@@ -469,11 +535,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)
@@ -574,14 +666,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);
 		}
 	}
 }
@@ -599,7 +691,7 @@ static PHP_METHOD(HttpClient, enqueue)
 	php_http_message_object_t *msg_obj;
 	php_http_client_enqueue_t q;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O|f", &request, php_http_client_request_class_entry, &fci, &fcc), invalid_arg, return);
+	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);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 	msg_obj = PHP_HTTP_OBJ(NULL, request);
@@ -642,7 +734,7 @@ static PHP_METHOD(HttpClient, dequeue)
 	php_http_client_object_t *obj;
 	php_http_message_object_t *msg_obj;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &request, php_http_client_request_class_entry), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &request, php_http_get_client_request_class_entry()), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 	msg_obj = PHP_HTTP_OBJ(NULL, request);
@@ -670,7 +762,7 @@ static PHP_METHOD(HttpClient, requeue)
 	php_http_message_object_t *msg_obj;
 	php_http_client_enqueue_t q;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O|f", &request, php_http_client_request_class_entry, &fci, &fcc), invalid_arg, return);
+	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);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 	msg_obj = PHP_HTTP_OBJ(NULL, request);
@@ -724,7 +816,7 @@ static PHP_METHOD(HttpClient, getResponse)
 	zval *zrequest = NULL;
 	php_http_client_object_t *obj;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|O", &zrequest, php_http_client_request_class_entry), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|O", &zrequest, php_http_get_client_request_class_entry()), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 
@@ -892,7 +984,7 @@ static PHP_METHOD(HttpClient, notify)
 	php_http_client_object_t *client_obj;
 	struct notify_arg arg = {NULL};
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|O!o!", &request, php_http_client_request_class_entry, &zprogress), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|O!o!", &request, php_http_get_client_request_class_entry(), &zprogress), invalid_arg, return);
 
 	client_obj = PHP_HTTP_OBJ(NULL, getThis());
 	observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
@@ -1010,7 +1102,7 @@ static PHP_METHOD(HttpClient, getProgressInfo)
 	php_http_message_object_t *req_obj;
 	php_http_client_progress_state_t *progress;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &request, php_http_client_request_class_entry), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &request, php_http_get_client_request_class_entry()), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 	req_obj = PHP_HTTP_OBJ(NULL, request);
@@ -1037,7 +1129,7 @@ static PHP_METHOD(HttpClient, getTransferInfo)
 	php_http_client_object_t *obj;
 	php_http_message_object_t *req_obj;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &request, php_http_client_request_class_entry), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &request, php_http_get_client_request_class_entry()), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 	req_obj = PHP_HTTP_OBJ(NULL, request);
@@ -1179,6 +1271,39 @@ 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, reset,                ai_HttpClient_reset,                ZEND_ACC_PUBLIC)
@@ -1211,6 +1336,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
 };
 
@@ -1226,11 +1352,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;