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/cpu.c
Simple merge

diff --cc src/curl.c
Simple merge

diff --cc src/curl_json.c
Simple merge

diff --cc src/logfile.c
index ded7732,e13c09e..0f20f3c
--- 1/src/logfile.c
--- 2/src/logfile.c
+++ b/src/logfile.c
@@@ -77,11 -92,10 +77,11 @@@ static int logfile_config (const char *
        return 0;
  } /* int logfile_config (const char *, const char *) */
  
 -static void logfile_print (const char *msg, int severity, time_t timestamp_time)
 +static void logfile_print (const char *msg, int severity,
 +              cdtime_t timestamp_time)
  {
        FILE *fh;
-       int do_close = 0;
+       _Bool do_close = 0;
        struct tm timestamp_tm;
        char timestamp_str[64];
        char level_str[16] = "";

diff --cc src/nginx.c
Simple merge

diff --cc src/write_http.c
Simple merge