diff --git a/ChangeLog b/ChangeLog index 7af6983..02a3001 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,10 @@ Changes in version 1.12.6 when the URL contains the letter '&'. (Problem pointed out by Silvan Calarco.) + * lib/libnetwork.lib - Davide Madrisan: + curl.download(): do use the curl options set by the function argument + '--options' (or '-o') instead of the global variable '$curl_options'. + ------------------------------------------------------------------------------- Changes in version 1.12.5 diff --git a/lib/libnetwork.lib.in b/lib/libnetwork.lib.in index 382512b..d8f1471 100644 --- a/lib/libnetwork.lib.in +++ b/lib/libnetwork.lib.in @@ -602,10 +602,10 @@ function curl.download() { pushd $destdir >/dev/null local retval - notify.debug "curl $curl_options\ + notify.debug "curl $curl_opts\ ${proxy:+ --proxy $proxy}${proxyuser:+ --proxy-user $proxy_user} $file_url" - curl $curl_options \ + curl $curl_opts \ ${proxy:+ --proxy $proxy} ${proxyuser:+ --proxy-user $proxy_user} \ "$file_url" retval=$?