Skip to content
This repository was archived by the owner on Aug 7, 2025. It is now read-only.

Commit 21036a2

Browse files
committed
Check whether proxies are necessary with --full
If --full is specified, even if URL checks succeeded, check whether they'll succeed *without* a proxy configured. Also check HTTPS_PROXY, as curl allows upper case for all but http_proxy.
1 parent a5d3fc6 commit 21036a2

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.69])
5-
AC_INIT([clr-network-troubleshooter],[14])
5+
AC_INIT([clr-network-troubleshooter],[15])
66
AM_INIT_AUTOMAKE
77

88
# Checks for programs.

scripts/clr-network-troubleshooter.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ sub check_proxies_reachable {
444444
}
445445
}
446446

447-
foreach my $proxy_var (qw(http_proxy https_proxy)) {
447+
foreach my $proxy_var (qw(http_proxy https_proxy HTTPS_PROXY)) {
448448
if (my $proxy = $ENV{${proxy_var}}) {
449449
my $failed;
450450
my $command = "curl --connect-timeout 10 -s --proxy '' -L ${proxy}";
@@ -488,9 +488,9 @@ sub check_proxies_reachable {
488488
sub check_proxies_necessary {
489489
# Check whether proxies are actually necessary to reach the test URLs
490490

491-
!$main_version_check && check_download_clearlinux_org('');
492-
!$mirror_version_check && check_mirror('');
493-
!$plain_http_check && check_plain_http_site('');
491+
($OPT_FULL || !$main_version_check) && check_download_clearlinux_org('');
492+
($OPT_FULL || !$mirror_version_check) && check_mirror('');
493+
($OPT_FULL || !$plain_http_check) && check_plain_http_site('');
494494
}
495495

496496
sub set_network_date {

0 commit comments

Comments
 (0)