kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 16:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "pjproject-bundled: Fix checksum verification when using cURL"

Browse Source
This commit is contained in:
Joshua Colp
2017-02-19 12:46:09 -06:00
committed by Gerrit Code Review
parent c227745bc7 51e3b11989
commit 0d9cfff45e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -7966,7 +7966,7 @@ if test "${WGET}" != ":" ; then
DOWNLOAD_TIMEOUT='--timeout=$1' DOWNLOAD_TIMEOUT='--timeout=$1'
else if test "${CURL}" != ":" ; then else if test "${CURL}" != ":" ; then
DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\"" DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar -w \"%{url_effective}\n\"" DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar"
DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)' DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
else else
# Extract the first word of "fetch", so it can be a program name with args. # Extract the first word of "fetch", so it can be a program name with args.

2
configure.ac
View File

@@ -297,7 +297,7 @@ if test "${WGET}" != ":" ; then
DOWNLOAD_TIMEOUT='--timeout=$1' DOWNLOAD_TIMEOUT='--timeout=$1'
else if test "${CURL}" != ":" ; then else if test "${CURL}" != ":" ; then
DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\"" DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar -w \"%{url_effective}\n\"" DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar"
DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)' DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
else else
AC_PATH_PROG([FETCH], [fetch], [:]) AC_PATH_PROG([FETCH], [fetch], [:])