Merge branch 'collectd-5.0' into collectd-5.1

Conflicts:
	src/swap.c

diff --cc configure.in
Simple merge

diff --cc contrib/collection3/bin/index.cgi
index 4723af9,e28e985..a850271
--- 1/contrib/collection3/bin/index.cgi
--- 2/contrib/collection3/bin/index.cgi
+++ b/contrib/collection3/bin/index.cgi
@@@ -237,31 -159,30 +237,53 @@@ sub end_htm
    </body>
  </html>
  HTML
 +  $html_started = 0;
 +}
 +
 +sub contains_invalid_chars
 +{
 +  my $str = shift;
 +
 +  for (split (m//, $str))
 +  {
 +    my $n = ord ($_);
 +
 +    # Whitespace is allowed.
 +    if (($n >= 9) && ($n <= 13))
 +    {
 +      next;
 +    }
 +    elsif ($n < 32)
 +    {
 +      return (1);
 +    }
 +  }
 +
 +  return;
  }
  
+ sub contains_invalid_chars
+ {
+   my $str = shift;
+ 
+   for (split (m//, $str))
+   {
+     my $n = ord ($_);
+ 
+     # Whitespace is allowed.
+     if (($n >= 9) && ($n <= 13))
+     {
+       next;
+     }
+     elsif ($n < 32)
+     {
+       return (1);
+     }
+   }
+ 
+   return;
+ }
+ 
  sub show_selector
  {
    my $timespan_selection = get_timespan_selection ();

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/utils_avltree.c
Simple merge