Merge branch 'collectd-5.6' into collectd-5.7

diff --combined src/curl_json.c
index aa1ae79,37a4b86..e6c0b51
--- 1/src/curl_json.c
--- 2/src/curl_json.c
+++ b/src/curl_json.c
@@@ -600,7 -600,7 +600,7 @@@ static int cj_init_curl(cj_t *db) /* {{
      curl_easy_setopt(db->curl, CURLOPT_TIMEOUT_MS, (long)db->timeout);
    else if (db->interval > 0)
      curl_easy_setopt(db->curl, CURLOPT_TIMEOUT_MS,
-                      (long)CDTIME_T_TO_MS(db->timeout));
+                      (long)CDTIME_T_TO_MS(db->interval));
    else
      curl_easy_setopt(db->curl, CURLOPT_TIMEOUT_MS,
                       (long)CDTIME_T_TO_MS(plugin_get_interval()));
@@@ -709,11 -709,10 +709,11 @@@ static int cj_config_add_url(oconfig_it
      cb_name = ssnprintf_alloc("curl_json-%s-%s", db->instance,
                                db->url ? db->url : db->sock);
  
 -    user_data_t ud = {.data = db, .free_func = cj_free};
 -
      plugin_register_complex_read(/* group = */ NULL, cb_name, cj_read,
 -                                 /* interval = */ db->interval, &ud);
 +                                 /* interval = */ db->interval,
 +                                 &(user_data_t){
 +                                     .data = db, .free_func = cj_free,
 +                                 });
      sfree(cb_name);
    } else {
      cj_free(db);