summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--lib/Smokeping/probes/Curl.pm3
-rw-r--r--lib/Smokeping/probes/EchoPing.pm3
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index c070129..6462f11 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,4 @@
+* don't test echoping or curl usage if running as a CGI --niko
* bail out at startup with an error message if LC_ALL is set --niko
2007/1/15 -- released version 2.0.910
diff --git a/lib/Smokeping/probes/Curl.pm b/lib/Smokeping/probes/Curl.pm
index 2e2ef01..5f237ab 100644
--- a/lib/Smokeping/probes/Curl.pm
+++ b/lib/Smokeping/probes/Curl.pm
@@ -188,7 +188,8 @@ sub new {
$self->_init if $self->can('_init');
- $self->test_usage;
+ # no need for this if running as a CGI
+ $self->test_usage unless $ENV{SERVER_SOFTWARE};
return $self;
}
diff --git a/lib/Smokeping/probes/EchoPing.pm b/lib/Smokeping/probes/EchoPing.pm
index 097cfe6..94f31ac 100644
--- a/lib/Smokeping/probes/EchoPing.pm
+++ b/lib/Smokeping/probes/EchoPing.pm
@@ -74,7 +74,8 @@ sub new {
$self->_init if $self->can('_init');
- $self->test_usage;
+ # no need for this if running as a CGI
+ $self->test_usage unless $ENV{SERVER_SOFTWARE};
return $self;
}