Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
	src/apache.c

diff --git a/src/apache.c b/src/apache.c
index 371e1d4..a333bf2 100644 (file)
--- a/src/apache.c
+++ b/src/apache.c
@@ -458,6 +458,7 @@ static int init_host (apache_t *st) /* {{{ */
        }
 
        curl_easy_setopt (st->curl, CURLOPT_URL, st->url);
+       curl_easy_setopt (st->curl, CURLOPT_FOLLOWLOCATION, 1);
 
        if (st->verify_peer != 0)
        {

diff --git a/src/ascent.c b/src/ascent.c
index 8829e51..1e7eca1 100644 (file)
--- a/src/ascent.c
+++ b/src/ascent.c
@@ -560,6 +560,7 @@ static int ascent_init (void) /* {{{ */
   }
 
   curl_easy_setopt (curl, CURLOPT_URL, url);
+  curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
 
   if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);

diff --git a/src/bind.c b/src/bind.c
index 3d46e51..6388774 100644 (file)
--- a/src/bind.c
+++ b/src/bind.c
@@ -1382,6 +1382,7 @@ static int bind_init (void) /* {{{ */
   curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION);
   curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, bind_curl_error);
   curl_easy_setopt (curl, CURLOPT_URL, (url != NULL) ? url : BIND_DEFAULT_URL);
+  curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
 
   return (0);
 } /* }}} int bind_init */

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 9ab6b98..0ef71b5 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -681,6 +681,6 @@ FQDNLookup   true
 # configured at all: All values will be sent to all available write plugins. #
 #----------------------------------------------------------------------------#
 
-#<Chain "Main">
+#<Chain "PostCache">
 #  Target "write"
 #</Chain>

diff --git a/src/curl.c b/src/curl.c
index 88b5496..d3c307e 100644 (file)
--- a/src/curl.c
+++ b/src/curl.c
@@ -346,6 +346,7 @@ static int cc_page_init_curl (web_page_t *wp) /* {{{ */
       PACKAGE_NAME"/"PACKAGE_VERSION);
   curl_easy_setopt (wp->curl, CURLOPT_ERRORBUFFER, wp->curl_errbuf);
   curl_easy_setopt (wp->curl, CURLOPT_URL, wp->url);
+  curl_easy_setopt (wp->curl, CURLOPT_FOLLOWLOCATION, 1);
 
   if (wp->user != NULL)
   {

diff --git a/src/filter_chain.c b/src/filter_chain.c
index c777fac..7c23a35 100644 (file)
--- a/src/filter_chain.c
+++ b/src/filter_chain.c
@@ -173,7 +173,7 @@ static char *fc_strdup (const char *orig) /* {{{ */
  *
  * The configuration looks somewhat like this:
  *
- *  <Chain "main">
+ *  <Chain "PreCache">
  *    <Rule>
  *      <Match "regex">
  *        Plugin "^mysql$"

diff --git a/src/nginx.c b/src/nginx.c
index cea3c84..53137a7 100644 (file)
--- a/src/nginx.c
+++ b/src/nginx.c
@@ -141,6 +141,8 @@ static int init (void)
     curl_easy_setopt (curl, CURLOPT_URL, url);
   }
 
+  curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
+
   if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
   {
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);