Merge branch 'collectd-4.9'

diff --cc configure.in
Simple merge

diff --cc contrib/collection.cgi
Simple merge

diff --cc src/apache.c
index 1028f04,ad877b5..39849e6
--- 1/src/apache.c
--- 2/src/apache.c
+++ b/src/apache.c
@@@ -685,11 -685,9 +685,12 @@@ static int apache_read_host (user_data_
                {
                        if (strcmp (fields[0], "Scoreboard:") == 0)
                                submit_scoreboard (fields[1], st);
-                       else if (strcmp (fields[0], "BusyServers:") == 0)
+                       else if ((strcmp (fields[0], "BusyServers:") == 0) /* Apache 1.* */
+                                       || (strcmp (fields[0], "BusyWorkers:") == 0) /* Apache 2.* */)
                                submit_gauge ("apache_connections", NULL, atol (fields[1]), st);
 +                      else if ((strcmp (fields[0], "IdleServers:") == 0) /* Apache 1.x */
 +                                      || (strcmp (fields[0], "IdleWorkers:") == 0) /* Apache 2.x */)
 +                              submit_gauge ("apache_idle_workers", NULL, atol (fields[1]), st);
                }
        }
  

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

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

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