From 15dd5767386b3b051d499bef32a2655fb9a21a01 Mon Sep 17 00:00:00 2001 From: onefang Date: Mon, 2 Dec 2019 21:32:24 +1000 Subject: Make it match test_rewrite.sh more. --- apt-panopticon.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apt-panopticon.lua b/apt-panopticon.lua index 5aaa858..ade9de3 100755 --- a/apt-panopticon.lua +++ b/apt-panopticon.lua @@ -461,7 +461,8 @@ checkHEAD = function (host, URL, r, retry) end IP = '--connect-to "' .. pu.host .. '::' .. PU.host .. ':"' end - local cmd = 'ionice -c3 nice -n 19 curl -I --retry 0 -s --path-as-is --connect-timeout ' .. options.timeout.value .. ' --max-redirs 0 ' .. IP .. ' ' .. '-o /dev/null -D results/"HEADERS_' .. fname .. '" ' .. + local cmd = 'ionice -c3 nice -n 19 curl -I --retry 0 -s --path-as-is --connect-timeout ' .. options.timeout.value .. ' --max-redirs 0 ' .. + IP .. ' ' .. '-o /dev/null -D results/"HEADERS_' .. fname .. '" ' .. hdr .. ' -w "#%{http_code} %{ssl_verify_result} %{url_effective}\\n" ' .. PU.scheme .. '://' .. host .. PU.path .. ' >>results/"STATUS_' .. fname .. '"' local status, result = execute(cmd) os.execute('cat results/"HEADERS_' .. fname .. '" >>results/"STATUS_' .. fname .. '" 2>/dev/null; rm results/"HEADERS_' .. fname .. '" 2>/dev/null') @@ -711,7 +712,7 @@ local postDownload = function(host, r, k) end local downloadLock = "flock -n results/curl-" -local download = "curl --connect-timeout " .. options.timeout.value .. " --create-dirs -L -z 'results/stamp.old' -v -R " +local download = "curl --connect-timeout " .. options.timeout.value .. " --create-dirs -f -L -z 'results/stamp.old' -v -R " local downloads = function(host, URL, release, list) if nil == URL then URL = "" end local lock = "%s-" .. host .. ".lock" -- cgit v1.1