X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapache.c;h=6489bce261180ca763497f2c148f972185012571;hb=17a04c7afcf44707f6bc45697212c1f8fc6aa761;hp=c6bf8addfed4d6918c7345e5839b3a92105a4c3f;hpb=7c8fb05fcb919fb2d9fc68757c198916396600ce;p=collectd.git

diff --git a/src/apache.c b/src/apache.c
index c6bf8add..6489bce2 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -55,7 +55,7 @@ static const char *config_keys[] =
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
 static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb,
-		void *stream)
+		void __attribute__((unused)) *stream)
 {
 	size_t len = size * nmemb;
 
@@ -148,7 +148,7 @@ static int init (void)
 
 		status = ssnprintf (credentials, sizeof (credentials), "%s:%s",
 				user, (pass == NULL) ? "" : pass);
-		if (status >= sizeof (credentials))
+		if ((status < 0) || ((size_t) status >= sizeof (credentials)))
 		{
 			ERROR ("apache plugin: init: Returning an error "
 					"because the credentials have been "
@@ -160,6 +160,7 @@ 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))
 	{
@@ -197,7 +198,6 @@ static void submit_counter (const char *type, const char *type_instance,
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "apache", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
@@ -220,7 +220,6 @@ static void submit_gauge (const char *type, const char *type_instance,
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "apache", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));