Skip to content

Commit

Permalink
Check whether proxies are necessary with --full
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bwarden committed Jun 8, 2021
1 parent a5d3fc6 commit 21036a2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.69])
AC_INIT([clr-network-troubleshooter],[14])
AC_INIT([clr-network-troubleshooter],[15])
AM_INIT_AUTOMAKE

# Checks for programs.
Expand Down
8 changes: 4 additions & 4 deletions scripts/clr-network-troubleshooter.in
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ sub check_proxies_reachable {
}
}

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

!$main_version_check && check_download_clearlinux_org('');
!$mirror_version_check && check_mirror('');
!$plain_http_check && check_plain_http_site('');
($OPT_FULL || !$main_version_check) && check_download_clearlinux_org('');
($OPT_FULL || !$mirror_version_check) && check_mirror('');
($OPT_FULL || !$plain_http_check) && check_plain_http_site('');
}

sub set_network_date {
Expand Down

0 comments on commit 21036a2

Please sign in to comment.