* (trunk)/

  doc/smokeping_install.pod,
  doc/smokeping_upgrade.pod,
  lib/Smokeping.pm,
  CHANGES:
  + make having an older version of CGI::Carp a non-fatal error and
    recommend a newer one in the docs

4 files changed, 22 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index c6fada7..d57264e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+* make having an older version of CGI::Carp a non-fatal error and
+  recommend a newer one in the docs
+  -- niko, reported by Ron Bisset <Ron.Bisset *cnrinternational.com>
+
 2005/9/28 -- released version 20050928_trunk
 
 2005/9/27 -- released version 20050927_trunk
diff --git a/doc/smokeping_install.pod b/doc/smokeping_install.pod
index 079e17f..515a110 100644
--- a/doc/smokeping_install.pod
+++ b/doc/smokeping_install.pod
@@ -125,6 +125,15 @@ need mod_speedy, just the plain and simple speedy executable, this is the
 beauty of this tool it works without touching your apache ...  Otherwise
 you could as well be using FastCGI or mod_perl.
 
+=item CGI::Carp
+
+L<http://http://search.cpan.org/~lds/CGI.pm/>
+
+If you are using a version of Perl older than 5.8.1, you should consider
+installing a newer version of CGI::Carp (must be at least 1.24, included in
+CGI.pm-2.82). Otherwise any error messages generated by the CGI script
+will not show up quite as clean as they could in the web server error log.
+
 =back
 
 =head2 Installation
diff --git a/doc/smokeping_upgrade.pod b/doc/smokeping_upgrade.pod
index 0100372..34feea2 100644
--- a/doc/smokeping_upgrade.pod
+++ b/doc/smokeping_upgrade.pod
@@ -230,6 +230,12 @@ in the C<host> variable, like it is with all the other probes.
 
 =back
 
+=head2 CGI::Carp module version
+
+The recommended version for CGI::Carp is now at least 1.24, included in
+CGI.pm-2.82 and the Perl standard distribution starting from 5.8.1.
+See L<the smokeping_install document|smokeping_install>. 
+
 =head1 1.38 to 1.40
 
 =over
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index 6b5f4a2..1e56c66 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -2472,7 +2472,9 @@ sub daemonize_me ($) {
 
 	sub initialize_cgilog (){
 		$use_cgilog = 1;
-        CGI::Carp::set_progname($0 . " [client " . ($ENV{REMOTE_ADDR}||"(unknown)") . "]");
+		# set_progname() is available starting with CGI.pm-2.82 / Perl 5.8.1
+		# so trap this inside 'eval'
+		eval 'CGI::Carp::set_progname($0 . " [client " . ($ENV{REMOTE_ADDR}||"(unknown)") . "]")';
 		$logging=1;
 	}