diff options
author | Kevin Harwell <kharwell@digium.com> | 2017-03-23 12:07:09 -0500 |
---|---|---|
committer | Kevin Harwell <kharwell@digium.com> | 2017-03-23 12:16:57 -0600 |
commit | 12dde3b568ff3e44527b73f61b073f902edfb10f (patch) | |
tree | 1d2def19bd564d830bd3a64296f0f0de569ae1dd | |
parent | c1ab8ca74cec45730107cca3ed47fc61460365e4 (diff) |
pjproject_bundled: raise timeout value used when downloading
After configuring Asterisk with '--with-pjproject-bundled' the configure/build
process attempts to download pjproject from its download site. Currently, a
timeout of 10 seconds is used that will stop the download process if pjproject
has not been fully downloaded in that time. For some systems this was not enough
time and the process was timing out too early.
This patch raises the download timeout value to '60'. Also, this patch fixes
another bug where the DOWNLOAD_TIMEOUT variable was not being properly exported
due to a naming error. DOWNLOAD_MAX_TIMEOUT is now properly renamed to
DOWNLOAD_TIMEOUT.
ASTERISK-26814 #close
Change-Id: Ia56e4e8a3d39db76bc8a1852b2cf07ec10b39842
-rw-r--r-- | makeopts.in | 2 | ||||
-rw-r--r-- | third-party/pjproject/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/makeopts.in b/makeopts.in index 6a1164c32..5bc5258da 100644 --- a/makeopts.in +++ b/makeopts.in @@ -28,7 +28,7 @@ WGET=@WGET@ FETCH=@FETCH@ DOWNLOAD=@DOWNLOAD@ DOWNLOAD_TO_STDOUT=@DOWNLOAD_TO_STDOUT@ -DOWNLOAD_MAX_TIMEOUT=@DOWNLOAD_MAX_TIMEOUT@ +DOWNLOAD_TIMEOUT=@DOWNLOAD_TIMEOUT@ SOUNDS_CACHE_DIR=@SOUNDS_CACHE_DIR@ EXTERNALS_CACHE_DIR=@EXTERNALS_CACHE_DIR@ RUBBER=@RUBBER@ diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile index 99c22fa8b..e691f2242 100644 --- a/third-party/pjproject/Makefile +++ b/third-party/pjproject/Makefile @@ -96,9 +96,9 @@ endef define download_from_pjproject ($(SHELL_ECHO_PREFIX) Downloading $(TARBALL_URL) to $(TARBALL) ;\ - $(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,10) $(TARBALL_URL) > $(TARBALL) &&\ + $(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,60) $(TARBALL_URL) > $(TARBALL) &&\ $(SHELL_ECHO_PREFIX) Downloading $(PJPROJECT_URL)/MD5SUM to $(PJMD5SUM) &&\ - $(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,10) $(PJPROJECT_URL)/MD5SUM.TXT > $(PJMD5SUM) &&\ + $(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,60) $(PJPROJECT_URL)/MD5SUM.TXT > $(PJMD5SUM) &&\ $(verify_tarball)) endef |