Merge "res_config_sqlite3: Fix crash when loading with invalid config"
authorzuul <zuul@gerrit.asterisk.org>
Sun, 19 Feb 2017 19:24:44 +0000 (13:24 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Sun, 19 Feb 2017 19:24:44 +0000 (13:24 -0600)
configure
configure.ac

index 2b25ead..148d111 100755 (executable)
--- a/configure
+++ b/configure
@@ -7966,7 +7966,7 @@ if test "${WGET}" != ":" ; then
   DOWNLOAD_TIMEOUT='--timeout=$1'
 else if test "${CURL}" != ":" ; then
   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)'
 else
   # Extract the first word of "fetch", so it can be a program name with args.
index 63d2b41..5a50498 100644 (file)
@@ -297,7 +297,7 @@ if test "${WGET}" != ":" ; then
   DOWNLOAD_TIMEOUT='--timeout=$1'
 else if test "${CURL}" != ":" ; then
   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)'
 else
   AC_PATH_PROG([FETCH], [fetch], [:])