From 9dc93c146edc904151f7a67aa3e4136b5a5392b5 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Tue, 18 Jun 2024 10:42:24 +0200 Subject: [PATCH] apache/http-mon.sh: dont use -L for wget2 as it's not implemented yet --- heartbeat/http-mon.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/heartbeat/http-mon.sh b/heartbeat/http-mon.sh index ce13ccd39a..ddd79c1f92 100644 --- a/heartbeat/http-mon.sh +++ b/heartbeat/http-mon.sh @@ -21,7 +21,7 @@ if ocf_is_true "$OCF_RESKEY_use_ipv6" || echo "$STATUSURL" | grep -qs "::"; then bind_address="::1" curl_ipv6_opts="-g" fi -WGETOPTS="-O- -q -L --no-proxy --bind-address=$bind_address" +WGETOPTS="-O- -q --no-proxy --bind-address=$bind_address" CURLOPTS="-o - -Ss -L --interface lo $curl_ipv6_opts" request_url_header() { @@ -58,6 +58,8 @@ curl_func() { fi } wget_func() { + # -L not implemented in wget2 + wget -V | grep -q "^GNU Wget2 " || WGETOPTS="$WGETOPTS -L" auth="" cl_opts="$WGETOPTS $test_httpclient_opts" [ x != "x$test_user" ] &&