Skip to content

Commit

Permalink
use https for fetching the pear installer
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyrael committed Jul 27, 2015
1 parent 9aa47d9 commit f3ad611
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion makedist
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ sed -i 's,^#ifndef YYTOKENTYPE,#include "zend.h"\n#ifndef YYTOKENTYPE,g' $MY_OLD
# download pear
$ECHO_N "makedist: Attempting to download PEAR's phar archive"
if test ! -x wget; then
wget http://pear.php.net/~cweiske/1.10.0dev1/install-pear-nozlib.phar -nd -P pear/
wget https://pear.php.net/~cweiske/1.10.0dev1/install-pear-nozlib.phar -nd -P pear/
else
$ECHO_N "Missing wget binary needed for pear download";
exit 7
Expand Down
7 changes: 4 additions & 3 deletions pear/Makefile.frag
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ WGET = `which wget 2>/dev/null`
FETCH = `which fetch 2>/dev/null`
PEAR_PREFIX = -dp a${program_prefix}
PEAR_SUFFIX = -ds a$(program_suffix)
PEAR_INSTALLER_URL = https://pear.php.net/~cweiske/1.10.0dev1/install-pear-nozlib.phar

install-pear-installer: $(SAPI_CLI_PATH)
@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
Expand All @@ -20,11 +21,11 @@ install-pear:
cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
else \
if test ! -z "$(WGET)" && test -x "$(WGET)"; then \
"$(WGET)" http://pear.php.net/~cweiske/1.10.0dev1/install-pear-nozlib.phar -nd -P $(builddir)/; \
"$(WGET)" "${PEAR_INSTALLER_URL}" -nd -P $(builddir)/; \
elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
"$(FETCH)" -o $(builddir)/ http://pear.php.net/~cweiske/1.10.0dev1/install-pear-nozlib.phar; \
"$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
else \
$(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php http://pear.php.net/~cweiske/1.10.0dev1/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
$(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
fi \
fi \
fi
Expand Down

0 comments on commit f3ad611

Please sign in to comment.