aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Oetiker <tobi@oetiker.ch>2022-01-21 08:26:06 +0100
committerGitHub <noreply@github.com>2022-01-21 08:26:06 +0100
commite44bf0d4504270c75702fd10663de4ba69929640 (patch)
tree9a23219e9374260b4a51ebf2726a7006260556f1
parent2ac9b91f9469f8b40c68c4abdea069b0c76b6bde (diff)
parent443141d55adecfb71582fbc7ed38f69f5b7e32b1 (diff)
downloadsmokeping-e44bf0d4504270c75702fd10663de4ba69929640.tar.gz
Merge branch 'master' into colors
-rw-r--r--CHANGES1
-rw-r--r--lib/Smokeping/probes/Curl.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 1fb926f..796289b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
- remove --insecure from curl (wget does not have it!) in configure.ac @Gunni
+ - add fix for curl feature checking introduced in curl 7.74 and later @matellis
2021-08-13 08:12:06 +0200 Tobias Oetiker <tobi@oetiker.ch>
diff --git a/lib/Smokeping/probes/Curl.pm b/lib/Smokeping/probes/Curl.pm
index 09f67a7..0ea30f0 100644
--- a/lib/Smokeping/probes/Curl.pm
+++ b/lib/Smokeping/probes/Curl.pm
@@ -220,7 +220,7 @@ sub test_usage {
my $arghashref = $self->features;
my %arghash = %$arghashref;
- my $curl_man = `$bin --help`;
+ my $curl_man = `$bin --help all`;
for my $feature (keys %arghash) {
next if $curl_man =~ /\Q$arghash{$feature}/;