From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 20 Mar 2016 11:29:06 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~377
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=daebbbee0ac53d39a0486aeb8c41fd358f46ed82;p=collectd.git

Merge branch 'collectd-5.5'
---

daebbbee0ac53d39a0486aeb8c41fd358f46ed82
diff --cc src/write_http.c
index 361c39e4,65197e6c..ec3a01ce
--- a/src/write_http.c
+++ b/src/write_http.c
@@@ -556,8 -544,8 +562,10 @@@ static int wh_config_node (oconfig_item
          cb->sslversion = CURL_SSLVERSION_DEFAULT;
          cb->low_speed_limit = 0;
          cb->timeout = 0;
 +        cb->log_http_error = 0;
+         cb->headers = NULL;
+ 
 +
          pthread_mutex_init (&cb->send_lock, /* attr = */ NULL);
  
          cf_util_get_string (ci, &cb->name);