From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 19 May 2015 20:44:27 +0000 (+0200)
Subject: Merge branch 'collectd-5.4'
X-Git-Tag: collectd-5.5.0~21
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=979b0fa58b2de639ff79209eff12ec17ff593483;hp=-c;p=collectd.git

Merge branch 'collectd-5.4'
---

979b0fa58b2de639ff79209eff12ec17ff593483
diff --combined src/curl_xml.c
index 9049d990,44e920c2..689d5e15
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
@@@ -76,12 -76,10 +76,12 @@@ struct cx_s /* {{{ *
    char *user;
    char *pass;
    char *credentials;
 +  _Bool digest;
    _Bool verify_peer;
    _Bool verify_host;
    char *cacert;
    char *post_body;
 +  int timeout;
    struct curl_slist *headers;
  
    cx_namespace_t *namespaces;
@@@ -343,6 -341,7 +343,7 @@@ static int cx_handle_single_value_xpat
  
    /* free up object */
    xmlXPathFreeObject (values_node_obj);
+   sfree (node_value);
  
    /* We have reached here which means that
     * we have got something to work */
@@@ -387,7 -386,7 +388,7 @@@ static int cx_handle_instance_xpath (xm
    /* If the base xpath returns more than one block, the result is assumed to be
     * a table. The `Instance' option is not optional in this case. Check for the
     * condition and inform the user. */
-   if (is_table)
+   if (is_table && (xpath->instance == NULL))
    {
      WARNING ("curl_xml plugin: "
          "Base-XPath %s is a table (more than one result was returned), "
@@@ -440,8 -439,12 +441,12 @@@
    if (xpath->instance_prefix != NULL)
    {
      if (instance_node != NULL)
+     {
+       char *node_value = (char *) xmlNodeGetContent(instance_node->nodeTab[0]);
        ssnprintf (vl->type_instance, sizeof (vl->type_instance),"%s%s",
-           xpath->instance_prefix, (char *) xmlNodeGetContent(instance_node->nodeTab[0]));
+           xpath->instance_prefix, node_value);
+       sfree (node_value);
+     }
      else
        sstrncpy (vl->type_instance, xpath->instance_prefix,
            sizeof (vl->type_instance));
@@@ -451,8 -454,11 +456,11 @@@
      /* If instance_prefix and instance_node are NULL, then
       * don't set the type_instance */
      if (instance_node != NULL)
-       sstrncpy (vl->type_instance, (char *) xmlNodeGetContent(instance_node->nodeTab[0]),
-           sizeof (vl->type_instance));
+     {
+       char *node_value = (char *) xmlNodeGetContent(instance_node->nodeTab[0]);
+       sstrncpy (vl->type_instance, node_value, sizeof (vl->type_instance));
+       sfree (node_value);
+     }
    }
  
    /* Free `instance_node_obj' this late, because `instance_node' points to
@@@ -840,19 -846,13 +848,19 @@@ static int cx_init_curl (cx_t *db) /* {
    curl_easy_setopt (db->curl, CURLOPT_NOSIGNAL, 1L);
    curl_easy_setopt (db->curl, CURLOPT_WRITEFUNCTION, cx_curl_callback);
    curl_easy_setopt (db->curl, CURLOPT_WRITEDATA, db);
 -  curl_easy_setopt (db->curl, CURLOPT_USERAGENT,
 -                    PACKAGE_NAME"/"PACKAGE_VERSION);
 +  curl_easy_setopt (db->curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT);
    curl_easy_setopt (db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf);
    curl_easy_setopt (db->curl, CURLOPT_URL, db->url);
 +  curl_easy_setopt (db->curl, CURLOPT_FOLLOWLOCATION, 1L);
 +  curl_easy_setopt (db->curl, CURLOPT_MAXREDIRS, 50L);
  
    if (db->user != NULL)
    {
 +#ifdef HAVE_CURLOPT_USERNAME
 +    curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user);
 +    curl_easy_setopt (db->curl, CURLOPT_PASSWORD,
 +        (db->pass == NULL) ? "" : db->pass);
 +#else
      size_t credentials_size;
  
      credentials_size = strlen (db->user) + 2;
@@@ -869,10 -869,6 +877,10 @@@
      ssnprintf (db->credentials, credentials_size, "%s:%s",
                 db->user, (db->pass == NULL) ? "" : db->pass);
      curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials);
 +#endif
 +
 +    if (db->digest)
 +      curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
    }
  
    curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, db->verify_peer ? 1L : 0L);
@@@ -885,14 -881,6 +893,14 @@@
    if (db->post_body != NULL)
      curl_easy_setopt (db->curl, CURLOPT_POSTFIELDS, db->post_body);
  
 +#ifdef HAVE_CURLOPT_TIMEOUT_MS
 +  if (db->timeout >= 0)
 +    curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) db->timeout);
 +  else
 +    curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS,
 +       CDTIME_T_TO_MS(plugin_get_interval()));
 +#endif
 +
    return (0);
  } /* }}} int cx_init_curl */
  
@@@ -918,8 -906,6 +926,8 @@@ static int cx_config_add_url (oconfig_i
    }
    memset (db, 0, sizeof (*db));
  
 +  db->timeout = -1;
 +
    if (strcasecmp ("URL", ci->key) == 0)
    {
      status = cf_util_get_string (ci, &db->url);
@@@ -949,8 -935,6 +957,8 @@@
        status = cf_util_get_string (child, &db->user);
      else if (strcasecmp ("Password", child->key) == 0)
        status = cf_util_get_string (child, &db->pass);
 +    else if (strcasecmp ("Digest", child->key) == 0)
 +      status = cf_util_get_boolean (child, &db->digest);
      else if (strcasecmp ("VerifyPeer", child->key) == 0)
        status = cf_util_get_boolean (child, &db->verify_peer);
      else if (strcasecmp ("VerifyHost", child->key) == 0)
@@@ -965,8 -949,6 +973,8 @@@
        status = cf_util_get_string (child, &db->post_body);
      else if (strcasecmp ("Namespace", child->key) == 0)
        status = cx_config_add_namespace (db, child);
 +    else if (strcasecmp ("Timeout", child->key) == 0)
 +      status = cf_util_get_int (child, &db->timeout);
      else
      {
        WARNING ("curl_xml plugin: Option `%s' not allowed here.", child->key);