Merge remote-tracking branch 'origin/v3.x'

diff --combined src/php_http_client.c
index a272fa45d0a4f6c2658b20273b828b57f7c0097f,4fdbfe8c93f5f15140c6771db5c9b8ac7a40a804..dcdfffab4ffd572fe5213c516423c81faa77e159
--- 1/src/php_http_client.c
--- 2/src/php_http_client.c
+++ b/src/php_http_client.c
@@@ -74,7 -74,7 +74,7 @@@ void php_http_client_options_set_subr(z
                zval old_opts_tmp, *old_opts, new_opts, *entry = NULL;
  
                array_init(&new_opts);
 -              old_opts = zend_read_property(this_ce, instance, ZEND_STRL("options"), 0, &old_opts_tmp);
 +              old_opts = zend_read_property(this_ce, Z_OBJ_P(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));
@@@ -97,7 -97,7 +97,7 @@@
                        }
                }
  
 -              zend_update_property(this_ce, instance, ZEND_STRL("options"), &new_opts);
 +              zend_update_property(this_ce, Z_OBJ_P(instance), ZEND_STRL("options"), &new_opts);
                zval_ptr_dtor(&new_opts);
        }
  }
@@@ -112,7 -112,7 +112,7 @@@ void php_http_client_options_set(zval *
        array_init(&new_opts);
  
        if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) {
 -              zend_update_property(this_ce, instance, ZEND_STRL("options"), &new_opts);
 +              zend_update_property(this_ce, Z_OBJ_P(instance), ZEND_STRL("options"), &new_opts);
                zval_ptr_dtor(&new_opts);
        } else {
                zval old_opts_tmp, *old_opts, add_opts, *opt;
@@@ -125,9 -125,9 +125,9 @@@
                                if (Z_TYPE_P(opt) == IS_ARRAY && (zend_string_equals_literal(key.key, "ssl") || zend_string_equals_literal(key.key, "cookies"))) {
                                        php_http_client_options_set_subr(instance, key.key->val, key.key->len, opt, 0);
                                } else if (is_client && (zend_string_equals_literal(key.key, "recordHistory") || zend_string_equals_literal(key.key, "responseMessageClass"))) {
 -                                      zend_update_property(this_ce, instance, key.key->val, key.key->len, opt);
 +                                      zend_update_property(this_ce, Z_OBJ_P(instance), key.key->val, key.key->len, opt);
                                } else if (Z_TYPE_P(opt) == IS_NULL) {
 -                                      old_opts = zend_read_property(this_ce, instance, ZEND_STRL("options"), 0, &old_opts_tmp);
 +                                      old_opts = zend_read_property(this_ce, Z_OBJ_P(instance), ZEND_STRL("options"), 0, &old_opts_tmp);
                                        if (Z_TYPE_P(old_opts) == IS_ARRAY) {
                                                zend_symtable_del(Z_ARRVAL_P(old_opts), key.key);
                                        }
@@@ -139,12 -139,12 +139,12 @@@
                }
                ZEND_HASH_FOREACH_END();
  
 -              old_opts = zend_read_property(this_ce, instance, ZEND_STRL("options"), 0, &old_opts_tmp);
 +              old_opts = zend_read_property(this_ce, Z_OBJ_P(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));
                }
                array_join(Z_ARRVAL(add_opts), Z_ARRVAL(new_opts), 0, 0);
 -              zend_update_property(this_ce, instance, ZEND_STRL("options"), &new_opts);
 +              zend_update_property(this_ce, Z_OBJ_P(instance), ZEND_STRL("options"), &new_opts);
                zval_ptr_dtor(&new_opts);
                zval_ptr_dtor(&add_opts);
        }
@@@ -153,7 -153,7 +153,7 @@@
  void php_http_client_options_get_subr(zval *instance, char *key, size_t len, zval *return_value)
  {
        zend_class_entry *this_ce = Z_OBJCE_P(instance);
 -      zval *options, opts_tmp, *opts = zend_read_property(this_ce, instance, ZEND_STRL("options"), 0, &opts_tmp);
 +      zval *options, opts_tmp, *opts = zend_read_property(this_ce, Z_OBJ_P(instance), ZEND_STRL("options"), 0, &opts_tmp);
  
        if ((Z_TYPE_P(opts) == IS_ARRAY) && (options = zend_symtable_str_find(Z_ARRVAL_P(opts), key, len))) {
                RETVAL_ZVAL(options, 1, 0);
@@@ -381,11 -381,11 +381,11 @@@ zend_object *php_http_client_object_new
        return &php_http_client_object_new_ex(ce, NULL)->zo;
  }
  
 -static HashTable *php_http_client_object_get_gc(zval *object, zval **table, int *n)
 +static HashTable *php_http_client_object_get_gc(zend_object *object, zval **table, int *n)
  {
 -      php_http_client_object_t *obj = PHP_HTTP_OBJ(NULL, object);
 +      php_http_client_object_t *obj = PHP_HTTP_OBJ(object, NULL);
        zend_llist_element *el = NULL;
 -      HashTable *props = Z_OBJPROP_P(object);
 +      HashTable *props = object->handlers->get_properties(object);
        uint32_t count = zend_hash_num_elements(props) + zend_llist_count(&obj->client->responses) + zend_llist_count(&obj->client->requests) + 2;
        zval *val;
  
@@@ -431,7 -431,7 +431,7 @@@
  
  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);
 +      zval new_hist, old_hist_tmp, *old_hist = zend_read_property(php_http_client_class_entry, Z_OBJ_P(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);
@@@ -443,7 -443,7 +443,7 @@@
                php_http_message_object_prepend(&new_hist, old_hist, 1);
        }
  
 -      zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), &new_hist);
 +      zend_update_property(php_http_client_class_entry, Z_OBJ_P(zclient), ZEND_STRL("history"), &new_hist);
        zval_ptr_dtor(&new_hist);
  }
  
@@@ -464,7 -464,7 +464,7 @@@ static ZEND_RESULT_CODE handle_response
                /* 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);
  
 -              if (zend_is_true(zend_read_property(php_http_client_class_entry, &zclient, ZEND_STRL("recordHistory"), 0, &rec_hist_tmp))) {
 +              if (zend_is_true(zend_read_property(php_http_client_class_entry, Z_OBJ(zclient), ZEND_STRL("recordHistory"), 0, &rec_hist_tmp))) {
                        handle_history(&zclient, e->request, *response);
                }
  
@@@ -481,7 -481,7 +481,7 @@@
                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_get_client_response_class_entry(), &zresponse, ZEND_STRL("transferInfo"), &info);
 +              zend_update_property(php_http_get_client_response_class_entry(), Z_OBJ(zresponse), ZEND_STRL("transferInfo"), &info);
                zval_ptr_dtor(&info);
  
                zend_llist_add_element(&client->responses, &msg_obj);
@@@ -562,11 -562,12 +562,11 @@@ static void handle_debug(void *arg, php
        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_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);
@@@ -606,7 -607,7 +606,7 @@@ static PHP_METHOD(HttpClient, __constru
                }
  
                object_init_ex(&os, spl_ce_SplObjectStorage);
 -              zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), &os);
 +              zend_update_property(php_http_client_class_entry, Z_OBJ_P(ZEND_THIS), ZEND_STRL("observers"), &os);
                zval_ptr_dtor(&os);
  
                if (persistent_handle_name) {
@@@ -649,13 -650,13 +649,13 @@@ static PHP_METHOD(HttpClient, reset
  static HashTable *combined_options(HashTable *options, zval *client, zval *request)
  {
        unsigned num_options = 0;
 -      zval z_roptions, z_options_tmp, *z_coptions = zend_read_property(php_http_client_class_entry, client, ZEND_STRL("options"), 0, &z_options_tmp);
 +      zval z_roptions, z_options_tmp, *z_coptions = zend_read_property(php_http_client_class_entry, Z_OBJ_P(client), ZEND_STRL("options"), 0, &z_options_tmp);
  
        if (Z_TYPE_P(z_coptions) == IS_ARRAY) {
                num_options = zend_hash_num_elements(Z_ARRVAL_P(z_coptions));
        }
        ZVAL_UNDEF(&z_roptions);
 -      zend_call_method_with_0_params(request, NULL, NULL, "getOptions", &z_roptions);
 +      zend_call_method_with_0_params(Z_OBJ_P(request), NULL, NULL, "getOptions", &z_roptions);
        if (Z_TYPE(z_roptions) == IS_ARRAY) {
                unsigned num = zend_hash_num_elements(Z_ARRVAL(z_roptions));
                if (num > num_options) {
@@@ -807,6 -808,8 +807,8 @@@ static PHP_METHOD(HttpClient, requeue
                        if (fci.object) {
                                GC_ADDREF(fci.object);
                        }
+                       e->closure.fci = fci;
+                       e->closure.fcc = fcc;
                }
                RETURN_ZVAL(getThis(), 1, 0);
        }
@@@ -835,7 -838,7 +837,7 @@@
        RETVAL_ZVAL(getThis(), 1, 0);
  }
  
 -ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_count, 0, 0, 0)
 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_HttpClient_count, 0, 0, IS_LONG, 0)
  ZEND_END_ARG_INFO();
  static PHP_METHOD(HttpClient, count)
  {
@@@ -898,7 -901,7 +900,7 @@@ static PHP_METHOD(HttpClient, getHistor
  
        php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
  
 -      zhistory = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("history"), 0, &zhistory_tmp);
 +      zhistory = zend_read_property(php_http_client_class_entry, Z_OBJ_P(ZEND_THIS), ZEND_STRL("history"), 0, &zhistory_tmp);
        RETVAL_ZVAL(zhistory, 1, 0);
  }
  
@@@ -1015,11 -1018,7 +1017,11 @@@ static int notify(zend_object_iterator 
        return ZEND_HASH_APPLY_STOP;
  }
  
 +#if PHP_VERSION_ID >= 80100
 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_HttpClient_notify, 0, 0, IS_VOID, 0)
 +#else
  ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_notify, 0, 0, 0)
 +#endif
        ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 1)
        ZEND_ARG_INFO(0, progress)
  ZEND_END_ARG_INFO();
@@@ -1032,7 -1031,7 +1034,7 @@@ static PHP_METHOD(HttpClient, notify
        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);
 +      observers = zend_read_property(php_http_client_class_entry, &client_obj->zo, ZEND_STRL("observers"), 0, &observers_tmp);
  
        if (Z_TYPE_P(observers) != IS_OBJECT) {
                php_http_throw(unexpected_val, "Observer storage is corrupted");
@@@ -1063,16 -1062,11 +1065,16 @@@
                        zval_ptr_dtor(zprogress);
                }
        }
 -
 +#if PHP_VERSION_ID < 80100
        RETVAL_ZVAL(getThis(), 1, 0);
 +#endif
  }
  
 +#if PHP_VERSION_ID >= 80100
 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_HttpClient_attach, 0, 1, IS_VOID, 0)
 +#else
  ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_attach, 0, 0, 1)
 +#endif
        ZEND_ARG_OBJ_INFO(0, observer, SplObserver, 0)
  ZEND_END_ARG_INFO();
  static PHP_METHOD(HttpClient, attach)
@@@ -1083,7 -1077,7 +1085,7 @@@
        php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &observer, spl_ce_SplObserver), 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);
 +      observers = zend_read_property(php_http_client_class_entry, &client_obj->zo, ZEND_STRL("observers"), 0, &observers_tmp);
  
        if (Z_TYPE_P(observers) != IS_OBJECT) {
                php_http_throw(unexpected_val, "Observer storage is corrupted");
@@@ -1095,18 -1089,13 +1097,18 @@@
        }
  
        ZVAL_UNDEF(&retval);
 -      zend_call_method_with_1_params(observers, NULL, NULL, "attach", &retval, observer);
 +      zend_call_method_with_1_params(Z_OBJ_P(observers), NULL, NULL, "attach", &retval, observer);
        zval_ptr_dtor(&retval);
 -
 +#if PHP_VERSION_ID < 80100
        RETVAL_ZVAL(getThis(), 1, 0);
 +#endif
  }
  
 +#if PHP_VERSION_ID >= 80100
 +ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_HttpClient_detach, 0, 1, IS_VOID, 0)
 +#else
  ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_detach, 0, 0, 1)
 +#endif
        ZEND_ARG_OBJ_INFO(0, observer, SplObserver, 0)
  ZEND_END_ARG_INFO();
  static PHP_METHOD(HttpClient, detach)
@@@ -1115,7 -1104,7 +1117,7 @@@
  
        php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &observer, spl_ce_SplObserver), invalid_arg, return);
  
 -      observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
 +      observers = zend_read_property(php_http_client_class_entry, Z_OBJ_P(ZEND_THIS), ZEND_STRL("observers"), 0, &observers_tmp);
  
        if (Z_TYPE_P(observers) != IS_OBJECT) {
                php_http_throw(unexpected_val, "Observer storage is corrupted");
@@@ -1123,11 -1112,10 +1125,11 @@@
        }
  
        ZVAL_UNDEF(&retval);
 -      zend_call_method_with_1_params(observers, NULL, NULL, "detach", &retval, observer);
 +      zend_call_method_with_1_params(Z_OBJ_P(observers), NULL, NULL, "detach", &retval, observer);
        zval_ptr_dtor(&retval);
 -
 +#if PHP_VERSION_ID < 80100
        RETVAL_ZVAL(getThis(), 1, 0);
 +#endif
  }
  
  ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getObservers, 0, 0, 0)
@@@ -1138,7 -1126,7 +1140,7 @@@ static PHP_METHOD(HttpClient, getObserv
  
        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, &observers_tmp);
 +      observers = zend_read_property(php_http_client_class_entry, Z_OBJ_P(ZEND_THIS), ZEND_STRL("observers"), 0, &observers_tmp);
  
        if (Z_TYPE_P(observers) != IS_OBJECT) {
                php_http_throw(unexpected_val, "Observer storage is corrupted");
@@@ -1214,7 -1202,7 +1216,7 @@@ ZEND_END_ARG_INFO()
  static PHP_METHOD(HttpClient, getOptions)
  {
        if (SUCCESS == zend_parse_parameters_none()) {
 -              zval options_tmp, *options = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), 0, &options_tmp);
 +              zval options_tmp, *options = zend_read_property(php_http_client_class_entry, Z_OBJ_P(ZEND_THIS), ZEND_STRL("options"), 0, &options_tmp);
                RETVAL_ZVAL(options, 1, 0);
        }
  }
@@@ -1403,7 -1391,7 +1405,7 @@@ PHP_MINIT_FUNCTION(http_client
        INIT_NS_CLASS_ENTRY(ce, "http", "Client", php_http_client_methods);
        php_http_client_class_entry = zend_register_internal_class_ex(&ce, NULL);
        php_http_client_class_entry->create_object = php_http_client_object_new;
 -      zend_class_implements(php_http_client_class_entry, 2, spl_ce_SplSubject, spl_ce_Countable);
 +      zend_class_implements(php_http_client_class_entry, 2, spl_ce_SplSubject, zend_ce_countable);
        memcpy(&php_http_client_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
        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;