* graph fixes for small numbers of pings -- Chris Wilson <chris *aidworld.org>

* fix the LDAP probe killing the CGI with perl <5.6 -- Peter Farmer <pfarmer *hashbang.org.uk>
* make the LDAP probe work withouth IO::Socket::SSL -- niko

* make Curl description shorter -- Chris Wilson <chris *aidworld.org>
* use CGI::Carp for CGI error handling
  - remove the now unnecessary kludge from AnotherDNS
* don't call exit() in the daemon __DIE__ handler
* raise Curl and EchoPingHttp{,s} default timeouts 
* add a section on timeouts to smokeping_upgrade
* add IO::Socket::SSL to smokeping_install

2 files changed, 27 insertions, 0 deletions

diff --git a/doc/smokeping_install.pod b/doc/smokeping_install.pod
index 7bb8a6b..079e17f 100644
--- a/doc/smokeping_install.pod
+++ b/doc/smokeping_install.pod
@@ -87,6 +87,10 @@ You need this for the AnotherDNS probe.
 
 You need this for the LDAP probe.
 
+=item IO::Socket::SSL
+
+You need this if you want the LDAP probe to be able to use the 'starttls' command.
+
 =item Authen::Radius
 
 You need this for the Radius probe.
diff --git a/doc/smokeping_upgrade.pod b/doc/smokeping_upgrade.pod
index 6c5fbc3..cbc324a 100644
--- a/doc/smokeping_upgrade.pod
+++ b/doc/smokeping_upgrade.pod
@@ -76,6 +76,19 @@ This is not an incompatible change, but it is mentioned here nevertheless.
 Target-specific variables can now be specified in the Probes section as well,
 and the values given become defaults for all the targets.
 
+=item Timeouts
+
+The C<timeout> variable in the Probes section is now the maximum time
+expected for B<one> ping to take. Previously it was the maximum time
+allowed for all the pings to one target.  This is an incompatible change,
+but the code now works in the way it was documented to work even in 1.38.
+
+Those probes offering a target-specific C<timeout> variable will get a
+default for it from the Probes section, as noted in the previous item.
+This should ensure that probes that enforce the ping timeout themselves
+(most do) will not get killed due to timeout before they have a chance
+to do it.
+
 =item Matchers
 
 The matcher modules have been renamed to start with a capital letter,
@@ -110,6 +123,16 @@ The change was made to fix the confusing situation where the C<host> variable
 was required for each actual target, but it didn't actually have any effect
 (as the server to be probed came from the C<url> variable.)
 
+The default timeout of this probe has been raised to 10 seconds.
+
+=item L<EchoPingHttp|Smokeping::probes::EchoPingHttp>
+
+The default timeout of this probe has been raised to 10 seconds.
+
+=item L<EchoPingHttps|Smokeping::probes::EchoPingHttps>
+
+The default timeout of this probe has been raised to 10 seconds.
+
 =item L<EchoPingIcp|Smokeping::probes::EchoPingIcp>
 
 The C<url> variable is now mandatory, as the old default "/" didn't make