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-Status: No, score=-3.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham 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 2A3E71FB06 for ; Sat, 6 Feb 2021 12:18:45 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 06/17] lei_query: trim curl options Date: Sat, 6 Feb 2021 12:18:33 +0000 Message-Id: <20210206121844.10979-7-e@80x24.org> In-Reply-To: <20210206121844.10979-1-e@80x24.org> References: <20210206121844.10979-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Get rid of short options which will or may conflict with some of our own. We may switch over to "git -c http.*" options since we need to run "git clone" and "git fetch" anyways. --- lib/PublicInbox/LeiQuery.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm index 56350386..7c856032 100644 --- a/lib/PublicInbox/LeiQuery.pm +++ b/lib/PublicInbox/LeiQuery.pm @@ -152,18 +152,21 @@ sub _complete_q { # with other "lei q" switches. # FIXME: Getopt::Long doesn't easily let us support support options with # '.' in them (e.g. --http1.1) +# TODO: should we depend on "-c http.*" options for things which have +# analogues in git(1)? that would reduce likelyhood of conflicts with +# our other CLI options sub curl_opt { qw( abstract-unix-socket=s anyauth basic cacert=s capath=s - cert-status cert-type cert|E=s ciphers=s config|K=s@ - connect-timeout=s connect-to=s cookie-jar|c=s cookie|b=s crlfile=s + cert-status cert-type cert=s ciphers=s config|K=s@ + connect-timeout=s connect-to=s cookie-jar=s cookie=s crlfile=s digest disable dns-interface=s dns-ipv4-addr=s dns-ipv6-addr=s dns-servers=s doh-url=s egd-file=s engine=s false-start happy-eyeballs-timeout-ms=s haproxy-protocol header|H=s@ - http2-prior-knowledge http2 insecure|k + http2-prior-knowledge http2 insecure interface=s ipv4 ipv6 junk-session-cookies - key-type=s key=s limit-rate=s local-port=s location-trusted location|L + key-type=s key=s limit-rate=s local-port=s location-trusted location max-redirs=i max-time=s negotiate netrc-file=s netrc-optional netrc - no-alpn no-buffer|N no-npn no-sessionid noproxy=s ntlm-wb ntlm + no-alpn no-buffer no-npn no-sessionid noproxy=s ntlm-wb ntlm pass=s pinnedpubkey=s post301 post302 post303 preproxy=s proxy-anyauth proxy-basic proxy-cacert=s proxy-capath=s proxy-cert-type=s proxy-cert=s proxy-ciphers=s proxy-crlfile=s @@ -176,7 +179,7 @@ sub curl_opt { qw( retry-connrefused retry-delay=s retry-max-time=s retry=i sasl-ir service-name=s socks4=s socks4a=s socks5-basic socks5-gssapi-service-name=s socks5-gssapi socks5-hostname=s socks5=s - speed-limit|Y speed-type|y ssl-allow-beast sslv2 sslv3 + speed-limit speed-type ssl-allow-beast sslv2 sslv3 suppress-connect-headers tcp-fastopen tls-max=s tls13-ciphers=s tlsauthtype=s tlspassword=s tlsuser=s tlsv1 trace-ascii=s trace-time trace=s