summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-01 22:05:56 +0000
committerKarl Berry <karl@freefriends.org>2021-05-01 22:05:56 +0000
commit68ab44aef8c88f359941186ee76c4adad78fff41 (patch)
tree052b30082a11c9b1c9f649073a0d44eac3ad87df
parent6b322e0b5d74b2d6e0c78df7b32cf1c71433be63 (diff)
(query_ctan_mirror): use curl if present in preference to wget.
(query_ctan_mirror_curl): new fn. (query_ctan_mirror_wget): new fn, was (essentially) query_ctan_mirror. (give_ctan_mirror_base): use https for backbone https://www.ctan.org. Add some ddebugging throughout for mirror resolution. Doc, formatting tweaks. New code from Norbert. git-svn-id: svn://tug.org/texlive/trunk@59044 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/TeXLive/TLCrypto.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm62
2 files changed, 54 insertions, 10 deletions
diff --git a/Master/tlpkg/TeXLive/TLCrypto.pm b/Master/tlpkg/TeXLive/TLCrypto.pm
index 58ad1f495dc..e0fa8f977dd 100644
--- a/Master/tlpkg/TeXLive/TLCrypto.pm
+++ b/Master/tlpkg/TeXLive/TLCrypto.pm
@@ -1,6 +1,6 @@
# $Id$
# TeXLive::TLCrypto.pm - handle checksums and signatures.
-# Copyright 2016-2020 Norbert Preining
+# Copyright 2016-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 786c35813cc..eafc24ff8aa 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2910,7 +2910,7 @@ Return C</dev/null> on Unix and C<nul> on Windows.
=cut
sub nulldev {
- return (&win32)? 'nul' : '/dev/null';
+ return (&win32()) ? 'nul' : '/dev/null';
}
=item C<get_full_line ($fh)>
@@ -3913,26 +3913,68 @@ Return a particular mirror given by the generic CTAN auto-redirecting
default (specified in L<$TLConfig::TexLiveServerURL>) if we get a
response, else the empty string.
-Neither C<TL_DOWNLOAD_PROGRAM> nor <TL_DOWNLOAD_ARGS> is honored (see
-L<download_file>), since certain options have to be set to do the job
-and the program has to be C<wget> since we parse the output.
+Use C<curl> if it is listed as a C<working_downloader>, else C<wget>,
+else give up. We can't support arbitrary downloaders here, as we do for
+regular package downloads, since certain options have to be set and the
+output has to be parsed.
+
+We try invoking the program three times (hardwired).
=cut
sub query_ctan_mirror {
+ my @working_downloaders = @{$::progs{'working_downloaders'}};
+ ddebug("query_ctan_mirror: working_downloaders: @working_downloaders\n");
+ if (TeXLive::TLUtils::member("curl", @working_downloaders)) {
+ return query_ctan_mirror_curl();
+ } elsif (TeXLive::TLUtils::member("wget", @working_downloaders)) {
+ return query_ctan_mirror_wget();
+ } else {
+ return;
+ }
+}
+
+# curl will follow the redirect chain for us.
+#
+sub query_ctan_mirror_curl {
+ my $max_trial = 3;
+ for (my $i = 1; $i <= $max_trial; $i++) {
+ # -L -> follow redirects
+ # -s -> silent
+ # -w -> what to output after completion
+ my $cmd = "$::progs{'curl'} -Ls "
+ . "-o " . nulldev() . " "
+ . "-w '%{url_effective}' "
+ . "--connect-timeout $NetworkTimeout "
+ . "--max-time $NetworkTimeout "
+ . $TeXLiveServerURL;
+ ddebug("query_ctan_mirror_curl: cmd: $cmd\n");
+ my $url = `$cmd`;
+ if (length $url) {
+ # remove trailing slashes
+ $url =~ s,/*$,,;
+ ddebug("query_ctan_mirror_curl: returning url: $url\n");
+ return $url;
+ }
+ sleep(1);
+ }
+ return;
+}
+
+sub query_ctan_mirror_wget {
my $wget = $::progs{'wget'};
if (!defined ($wget)) {
- tlwarn("query_ctan_mirror: Programs not set up, trying wget\n");
+ tlwarn("query_ctan_mirror_wget: Programs not set up, trying wget\n");
$wget = "wget";
}
# we need the verbose output, so no -q.
# do not reduce retries here, but timeout still seems desirable.
my $mirror = $TeXLiveServerURL;
- my $cmd = "$wget $mirror --timeout=$NetworkTimeout -O "
- . (win32() ? "nul" : "/dev/null") . " 2>&1";
+ my $cmd = "$wget $mirror --timeout=$NetworkTimeout "
+ . "-O " . nulldev() . " 2>&1";
+ ddebug("query_ctan_mirror_wget: cmd is $cmd\n");
- #
# since we are reading the output of wget to find a mirror
# we have to make sure that the locale is unset
my $saved_lcall;
@@ -3950,6 +3992,7 @@ sub query_ctan_mirror {
foreach (@out) {
if (m/^Location: (\S*)\s*.*$/) {
(my $mhost = $1) =~ s,/*$,,; # remove trailing slashes since we add it
+ ddebug("query_ctan_mirror_wget: returning url: $mhost\n");
return $mhost;
}
}
@@ -4013,9 +4056,10 @@ sub check_on_working_mirror {
sub give_ctan_mirror_base {
# only one backbone has existed for a while (2018).
- my @backbone = qw!http://www.ctan.org/tex-archive!;
+ my @backbone = qw!https://www.ctan.org/tex-archive!;
# start by selecting a mirror and test its operationality
+ ddebug("give_ctan_mirror_base: calling query_ctan_mirror\n");
my $mirror = query_ctan_mirror();
if (!defined($mirror)) {
# three times calling mirror.ctan.org did not give anything useful,