sad/firehol
1
0
Fork 0
mirror of https://github.com/firehol/firehol.git synced 2024-06-28 09:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix curl --time-cond 5th try

Browse Source
This commit is contained in:
Costa Tsaousis (ktsaou) 2017-09-30 21:48:46 +03:00
parent d227646372
commit 1d11b093d0
No known key found for this signature in database
GPG Key ID: 29CA335889B9A863
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/update-ipsets
View File

@ -1040,7 +1040,7 @@ copyfile() {
}
geturl() {
local file="${1}" reference="${2}" url="${3}" doptions=() ret= http_code= curl_opts= message=
local file="${1}" reference="${2}" url="${3}" doptions=() ret= http_code= curl_opts=() message=
eval "local doptions=(${4})"
@ -1052,16 +1052,16 @@ geturl() {
# copy the timestamp of the reference
# to our file - we need this to check it later
$TOUCH_CMD -r "${reference}" "${file}"
curl_opts="${curl_opts} --time-cond ${reference}"
curl_opts+=("--time-cond" "${reference}")
fi
[ ${VERBOSE} -eq 0 ] && curl_opts="${curl_opts} --silent"
[ ${VERBOSE} -eq 0 ] && curl_opts+=("--silent")
downloader_log verbose "curl ${doptions} '${url}'"
http_code=$( \
$CURL_CMD --connect-timeout ${MAX_CONNECT_TIME} --max-time ${MAX_DOWNLOAD_TIME} \
--retry 0 --fail --compressed --user-agent "${USER_AGENT}" \
${curl_opts} \
"${curl_opts[@]}" \
--output "${file}" --remote-time \
--location --referer "http://iplists.firehol.org/" \
--write-out '%{http_code}' "${doptions[@]}" "${url}" \