From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 20 Aug 2009 11:52:34 +0000 (+0200)
Subject: Merge branch 'collectd-4.6' into collectd-4.7
X-Git-Tag: collectd-4.7.3~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=03aa21f08fede809f37a7443d3124fb9314f4dc8;p=collectd.git

Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
	src/apache.c
---

03aa21f08fede809f37a7443d3124fb9314f4dc8
diff --cc src/apache.c
index 371e1d4b,6489bce2..a333bf2b
--- a/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/collectd.conf.in
index 9ab6b98e,86258f28..0ef71b58
--- a/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>