From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLACK shortcircuit=no autolearn=no autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 497501F522; Thu, 29 Sep 2022 17:50:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1664473832; bh=OxLiIaKWXUUVVfTMdkQjultpUPSwRPTcqafnlkKSbS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aLwgVQ8f4i+cW+7QPZlmmpRBjQk02sJZ5sEKkzlYDAin8MrgOUZoxKozPhp+EoYXb Gbq+OfRQlTRxk6SxvHlGaGTsIjwTBYutAlcfo4nu6elC0VVlPvMRZUk+qVIKGcLjyU SrrhwUN4jCoBqlfxm82PM/T6tkcN6ZQ6Wwa/UGOY= From: Eric Wong To: meta@public-inbox.org Cc: Konstantin Ryabitsev Subject: [PATCH 2/4] treewide: use --globoff with curl(1) Date: Thu, 29 Sep 2022 17:48:29 +0000 Message-Id: <20220929174831.2919939-3-e@80x24.org> In-Reply-To: <20220929174831.2919939-1-e@80x24.org> References: <20220929174831.2919939-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: curl 7.29.0 (on CentOS 7.x) seems to mishandle square-bracketed IPv6 addresses, at least. Furthermore, we don't actually need nor use the globbing in curl for lei when forwarding requests from the lei command-line. lei has its own globbing and `--globoff' behavior for externals and none of it is intended for curl. --- lib/PublicInbox/LeiCurl.pm | 4 ++-- t/httpd-corner.t | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/PublicInbox/LeiCurl.pm b/lib/PublicInbox/LeiCurl.pm index 5ffade99..4e602a48 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) @@ -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) { diff --git a/t/httpd-corner.t b/t/httpd-corner.t index 973cc55d..e16e8dc8 100644 --- a/t/httpd-corner.t +++ b/t/httpd-corner.t @@ -341,7 +341,7 @@ SKIP: { my $url = "$base/sha1"; my ($r, $w); pipe($r, $w) or die "pipe: $!"; - my $cmd = [$curl, qw(--tcp-nodelay -T- -HExpect: -sSN), $url]; + my $cmd = [$curl, qw(--tcp-nodelay -T- -HExpect: -gsSN), $url]; open my $cout, '+>', undef or die; open my $cerr, '>', undef or die; my $rdr = { 0 => $r, 1 => $cout, 2 => $cerr }; @@ -358,7 +358,7 @@ SKIP: { seek($cout, 0, SEEK_SET); is(<$cout>, sha1_hex($str), 'read expected body'); - my $fh = popen_rd([$curl, '-sS', "$base/async-big"]); + my $fh = popen_rd([$curl, '-gsS', "$base/async-big"]); my $n = 0; my $non_zero = 0; while (1) { @@ -372,12 +372,12 @@ SKIP: { is($non_zero, 0, 'read all zeros'); require_mods(@zmods, 4); - my $buf = xqx([$curl, '-sS', "$base/psgi-return-gzip"]); + my $buf = xqx([$curl, '-gsS', "$base/psgi-return-gzip"]); is($?, 0, 'curl succesful'); IO::Uncompress::Gunzip::gunzip(\$buf => \(my $out)); is($out, "hello world\n"); my $curl_rdr = { 2 => \(my $curl_err = '') }; - $buf = xqx([$curl, qw(-sSv --compressed), + $buf = xqx([$curl, qw(-gsSv --compressed), "$base/psgi-return-compressible"], undef, $curl_rdr); is($?, 0, 'curl --compressed successful'); is($buf, "goodbye world\n", 'gzipped response as expected');