Merge branch 'collectd-4.10' into collectd-5.3

diff --cc configure.in
index 84d017a4eb07c941f4388bfc28f58f1979873461,5dac543169ca42d2d1eac2ff6acdd0708afa6a29..b00df81a4d171dade926d72d45f571f939da6aa2
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -4329,10 -3748,10 +4329,10 @@@ the
        then
                with_libxml2="yes"
        else
 -              with_libxml2="no (pkg-config doesn't know library)"
 +              with_libxml2="no (pkg-config doesn't know libxml-2.0)"
        fi
  
-       pkg-config --exists libvirt 2>/dev/null
+       $PKG_CONFIG --exists libvirt 2>/dev/null
        if test "$?" = "0"
        then
                with_libvirt="yes"

diff --cc src/configfile.c
index 154c041cee2d8b6d01ff4021c723810993c91dac,983d99569796fde8b684242663106357e3506d3d..7e06baa2c83b7eaeb78005fd545105119848d64e
--- 1/src/configfile.c
--- 2/src/configfile.c
+++ b/src/configfile.c
@@@ -572,25 -515,13 +578,26 @@@ static int cf_include_all (oconfig_item
                        continue;
                }
  
 -              new = cf_read_generic (old->values[0].value.string, depth + 1);
 +              for (j = 0; j < old->children_num; ++j)
 +              {
 +                      oconfig_item_t *child = old->children + j;
 +
 +                      if (strcasecmp (child->key, "Filter") == 0)
 +                              cf_util_get_string (child, &pattern);
 +                      else
 +                              ERROR ("configfile: Option `%s' not allowed in <Include> block.",
 +                                              child->key);
 +              }
 +
 +              new = cf_read_generic (old->values[0].value.string, pattern, depth + 1);
 +              sfree (pattern);
 +
                if (new == NULL)
 -                      continue;
 +                      return (-1);
  
                /* Now replace the i'th child in `root' with `new'. */
-               cf_ci_replace_child (root, new, i);
+               if (cf_ci_replace_child (root, new, i) < 0)
+                       return (-1);
  
                /* ... and go back to the new i'th child. */
                --i;

diff --cc src/curl.c
Simple merge

diff --cc src/curl_json.c
Simple merge

diff --cc src/curl_xml.c
index 356219a2c92a346360b72a4745adc9bb29664347,28b2ded0104b79a6027119db8fe4d908a4474972..7ca9831f9e85fe95aae6315b702520387686a18f
--- 1/src/curl_xml.c
--- 2/src/curl_xml.c
+++ b/src/curl_xml.c
@@@ -383,9 -342,9 +383,9 @@@ static int cx_handle_instance_xpath (xm
    memset (vl->type_instance, 0, sizeof (vl->type_instance));
  
    /* If the base xpath returns more than one block, the result is assumed to be
 -   * a table. The `Instnce' option is not optional in this case. Check for the
 +   * a table. The `Instance' option is not optional in this case. Check for the
     * condition and inform the user. */
-   if (is_table && (vl->type_instance == NULL))
+   if (is_table)
    {
      WARNING ("curl_xml plugin: "
          "Base-XPath %s is a table (more than one result was returned), "

diff --cc src/snmp.c
Simple merge

diff --cc src/write_http.c
Simple merge