Merge branch 'collectd-4.10' into collectd-5.1

Conflicts:
	src/curl_json.c

diff --cc src/apache.c
Simple merge

diff --cc src/bind.c
Simple merge

diff --cc src/curl.c
Simple merge

diff --cc src/curl_json.c
index 2ddaff3594d47663277deb886603e290a1363723,24e1df1e9b016d5086b6efdae445fdc6e9e6b625..19efc5d6fd54f0f119ff1ef0bfcec9d445a7b541
--- 1/src/curl_json.c
--- 2/src/curl_json.c
+++ b/src/curl_json.c
@@@ -766,14 -817,11 +759,14 @@@ static int cj_curl_perform (cj_t *db, C
      return (-1);
    }
  
 +  url = NULL;
 +  curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url);
 +
    status = curl_easy_perform (curl);
-   if (status != 0)
+   if (status != CURLE_OK)
    {
      ERROR ("curl_json plugin: curl_easy_perform failed with status %i: %s (%s)",
 -           status, db->curl_errbuf, url);
 +           status, db->curl_errbuf, (url != NULL) ? url : "<null>");
      yajl_free (db->yajl);
      db->yajl = yprev;
      return (-1);

diff --cc src/exec.c
Simple merge

diff --cc src/mysql.c
Simple merge

diff --cc src/nginx.c
Simple merge

diff --cc src/write_http.c
Simple merge