Commit 0faabbe4 authored by Tails developers's avatar Tails developers

Import new htpdate (commit 5f9fba8), and adapt invocation syntax.

5f9fba8 Change --proxy handling to support Debian Squeeze's curl.
parent c4aaa982
......@@ -75,7 +75,7 @@ do_start() {
--pal_pool "$HTP_POOL_PAL" \
--neutral_pool "$HTP_POOL_NEUTRAL" \
--foe_pool "$HTP_POOL_FOE" \
--proxy "socks5h://127.0.0.1:9062/"
--proxy 127.0.0.1:9062
return $?
}
......
......@@ -98,7 +98,7 @@ sub parseCommandLine () {
[ 'neutral_pool=s@', "neutral hostnames" ],
[ 'foe_pool=s@', "distrusted hostnames" ],
[ 'allowed_per_pool_failure_ratio:f', "ratio (0.0-1.0) of allowed per-pool failure", { default => 1.0 } ],
[ 'proxy|p:s', "what to pass to curl's --proxy" ],
[ 'proxy|p:s', "what to pass to curl's --socks5-hostname" ],
);
usage() if $opt->help;
......@@ -224,7 +224,7 @@ sub getUrlDateDiff {
'--proto', '=https', '--tlsv1',
'--head', '--output', catfile($tmpdir, 'headers'),
);
push @curl_options, ('--proxy', $proxy) if defined $proxy;
push @curl_options, ('--socks5-hostname', $proxy) if defined $proxy;
my @cmdline = ('curl', @curl_options, $url);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment