fix for changed shutdown order in PHP-7.4

[m6w6/ext-http] / src / php_http_client.c

diff --git a/src/php_http_client.c b/src/php_http_client.c
index b719d2f6676b49ae78d9b525c981e1bd1d25daca..9551dd0bbe775f252a8893f090a17f06ddb5d36f 100644 (file)
--- a/src/php_http_client.c
+++ b/src/php_http_client.c
@@ -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);
@@ -376,7 +378,7 @@ static HashTable *php_http_client_object_get_gc(zval *object, zval **table, int
        *n = 0;
        *table = obj->gc = erealloc(obj->gc, sizeof(zval) * count);
 
-#if PHP_HTTP_HAVE_CURL
+#if PHP_HTTP_HAVE_LIBCURL
        if (obj->client->ops == php_http_client_curl_get_ops()) {
                php_http_client_curl_t *curl = obj->client->ctx;
 
@@ -399,8 +401,9 @@ static HashTable *php_http_client_object_get_gc(zval *object, zval **table, int
 
        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);
+               if (q->request_obj) {
+                       ZVAL_OBJ(&obj->gc[(*n)++], &q->request_obj->zo);
+               }
        }
 
        ZEND_HASH_FOREACH_VAL(props, val)
@@ -476,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);
 
@@ -521,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);
@@ -542,7 +549,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);
@@ -575,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))) {
@@ -681,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);
 
@@ -689,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;
@@ -703,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;
@@ -732,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;
        }
 
@@ -773,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);
                }
        }
 
@@ -826,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;
        }
 
@@ -969,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)
 {
@@ -982,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;
        }
 
@@ -1028,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;
        }
 
@@ -1055,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;
        }
 
@@ -1077,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;
        }
 
@@ -1264,7 +1283,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)
 {
@@ -1296,7 +1316,7 @@ static PHP_METHOD(HttpClient, setDebug)
 }
 
 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)