X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiCurl.pm;h=48c66ee9c0a93564b76e4a66580d5bc8b9da6ae9;hb=HEAD;hp=5ffade9976cb43a194e784c955d4b515d2b8a90f;hpb=afd4be5163b39050ac9892b8a511f11f417acf7b;p=public-inbox.git
diff --git a/lib/PublicInbox/LeiCurl.pm b/lib/PublicInbox/LeiCurl.pm
index 5ffade99..48c66ee9 100644
--- a/lib/PublicInbox/LeiCurl.pm
+++ b/lib/PublicInbox/LeiCurl.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
# common option and torsocks(1) wrapping for curl(1)
@@ -7,8 +7,7 @@
# n.b. curl may support a daemon/client model like lei someday:
# https://github.com/curl/curl/wiki/curl-tool-master-client
package PublicInbox::LeiCurl;
-use strict;
-use v5.10.1;
+use v5.12;
use PublicInbox::Spawn qw(which);
use PublicInbox::Config;
@@ -27,7 +26,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) {
@@ -77,8 +76,8 @@ sub for_uri {
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);
+ my $p = $cfg ? $cfg->urlmatch('http.Proxy', $$uri, 1) : undef;
+ push(@opt, '--proxy', $p) if defined($p);
}
bless [ @$pfx, @$self, @opt, $uri->as_string ], ref($self);
}