X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=714d6b44caff13542436eae6e16631a0592880fa;hb=86613b3222ebbe16464ce10b0a1a734ceb1eabba;hp=48be1987c2c4e7e2acf200dfa371544334b31ea4;hpb=f9462701607b57a6debcf3e0e7a5548a56af3cf6;p=dgit.git diff --git a/dgit b/dgit index 48be1987..714d6b44 100755 --- a/dgit +++ b/dgit @@ -1195,6 +1195,7 @@ sub cfg_apply_map ($$$) { sub url_fetch ($;@) { my ($url, %xopts) = @_; # Ok404 => 1 means give undef for 404 + # AccessBase => 'archive-query' (eg) use WWW::Curl::Easy; @@ -1211,9 +1212,9 @@ sub url_fetch ($;@) { $setopt->(CURLOPT_NOSIGNAL, 1); $setopt->(CURLOPT_WRITEDATA, \$response_body); - if ($url =~ m#^https://([-.0-9a-z]+)/#) { - foreach my $k (qw(archive-query-tls-key - archive-query-tls-curl-ca-args)) { + if ($xopts{AccessBase} && $url =~ m#^https://([-.0-9a-z]+)/#) { + foreach my $k ("$xopts{AccessBase}-tls-key", + "$xopts{AccessBase}-tls-curl-ca-args") { fail "config option $k is obsolete and no longer supported" if defined access_cfg($k, 'RETURN-UNDEF'); } @@ -1242,7 +1243,9 @@ sub api_query_raw ($;$) { my ($subpath, $ok404) = @_; my $url = access_cfg('archive-query-url'); $url .= $subpath; - return url_fetch $url, Ok404 => $ok404; + return url_fetch $url, + Ok404 => $ok404, + AccessBase => 'archive-query'; } sub api_query ($$;$) {