Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
	src/apache.c

diff --cc src/apache.c
index 371e1d4b3439824a17a07d416a0080fb740c531f,6489bce261180ca763497f2c148f972185012571..a333bf2b50a7db6a6ab39d1e2eaa962ca1902f17
--- 1/src/apache.c
--- 2/src/apache.c
+++ b/src/apache.c
@@@ -454,14 -156,15 +454,15 @@@ static int init_host (apache_t *st) /* 
                        return (-1);
                }
  
 -              curl_easy_setopt (curl, CURLOPT_USERPWD, credentials);
 +              curl_easy_setopt (st->curl, CURLOPT_USERPWD, credentials);
        }
  
 -      curl_easy_setopt (curl, CURLOPT_URL, url);
 -      curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
 +      curl_easy_setopt (st->curl, CURLOPT_URL, st->url);
++      curl_easy_setopt (st->curl, CURLOPT_FOLLOWLOCATION, 1);
  
 -      if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
 +      if (st->verify_peer != 0)
        {
 -              curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);
 +              curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYPEER, 1);
        }
        else
        {

diff --cc src/bind.c
Simple merge

diff --cc src/collectd.conf.in
index 9ab6b98e494551a049e4ced4d20114ab492f712e,86258f2845c24ce88345c89af95d71f2c8ed04f3..0ef71b5814ca1acb32e9739bbfbe6664f1130a05
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -675,12 -553,10 +675,12 @@@ FQDNLookup   tru
  #@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@LoadPlugin target_notification
  #@BUILD_PLUGIN_TARGET_REPLACE_TRUE@LoadPlugin target_replace
  #@BUILD_PLUGIN_TARGET_SET_TRUE@LoadPlugin target_set
 - 
 -# The following block demonstrates the default behavior if no filtering is
 -# configured at all: All values will be sent to all available write plugins.
 +
 +#----------------------------------------------------------------------------#
 +# The following block demonstrates the default behavior if no filtering is   #
 +# configured at all: All values will be sent to all available write plugins. #
 +#----------------------------------------------------------------------------#
  
- #<Chain "Main">
+ #<Chain "PostCache">
  #  Target "write"
  #</Chain>