X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client.c;h=4118ab18263fd7156a7852ba3860c610bc95dac0;hp=b719d2f6676b49ae78d9b525c981e1bd1d25daca;hb=b3831bc5f19cf32880ea19341c3527f0e9553517;hpb=7214e1aef4efce10bcc509d2a741acef88d28781 diff --git a/src/php_http_client.c b/src/php_http_client.c index b719d2f..4118ab1 100644 --- a/src/php_http_client.c +++ b/src/php_http_client.c @@ -476,7 +476,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); @@ -521,7 +523,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); @@ -542,7 +546,9 @@ static void handle_debug(void *arg, php_http_client_t *client, php_http_client_e 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); @@ -1264,7 +1270,8 @@ static PHP_METHOD(HttpClient, getAvailableConfiguration) } ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_setDebug, 0, 0, 1) - ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 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) {