treewide: use --globoff with curl(1)

[public-inbox.git] / lib / PublicInbox / LeiCurl.pm

diff --git a/lib/PublicInbox/LeiCurl.pm b/lib/PublicInbox/LeiCurl.pm
index ce57e7963ae98743440e58f64640f10661ff9cb4..4e602a488c12b48032a7a514faaba83b169f2102 100644 (file)
--- a/lib/PublicInbox/LeiCurl.pm
+++ b/lib/PublicInbox/LeiCurl.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # common option and torsocks(1) wrapping for curl(1)
@@ -27,7 +27,7 @@ sub new {
        my ($cls, $lei, $curl) = @_;
        $curl //= which('curl') // return $lei->fail('curl not found');
        my $opt = $lei->{opt};
-       my @cmd = ($curl, qw(-Sf));
+       my @cmd = ($curl, qw(-gSf));
        $cmd[-1] .= 's' if $opt->{quiet}; # already the default for "lei q"
        $cmd[-1] .= 'v' if $opt->{verbose}; # we use ourselves, too
        for my $o ($lei->curl_opt) {
@@ -75,6 +75,11 @@ EOM
 sub for_uri {
        my ($self, $lei, $uri, @opt) = @_;
        my $pfx = torsocks($self, $lei, $uri) or return; # error
+       if ($uri->scheme =~ /\Ahttps?\z/i) {
+               my $cfg = $lei->_lei_cfg;
+               my $p = $cfg ? $cfg->urlmatch('http.Proxy', $$uri) : undef;
+               push(@opt, "--proxy=$p") if defined($p);
+       }
        bless [ @$pfx, @$self, @opt, $uri->as_string ], ref($self);
 }