archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

patch by Christopher Jones: use wget/fetch by default if available, correct typo/Errrrrorr in fetch.php

Browse source
This commit is contained in:
Greg Beaver 2008-05-30 23:42:50 +00:00
parent 83e491b2c3
commit 3f0952cdf7
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pear/Makefile.frag
View file

@ -5,6 +5,9 @@ peardir=$(PEAR_INSTALLDIR)
# Skip all php.ini files altogether # Skip all php.ini files altogether
PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0
WGET = `which wget 2>/dev/null`
FETCH = `which fetch 2>/dev/null`
install-pear-installer: $(SAPI_CLI_PATH) install-pear-installer: $(SAPI_CLI_PATH)
@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
@ -14,7 +17,13 @@ install-pear:
if test -f $(srcdir)/install-pear-nozlib.phar; then \ if test -f $(srcdir)/install-pear-nozlib.phar; then \
cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
else \ else \
$(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php http://pear.php.net/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ if test ! -z "$(WGET)" && test -x "$(WGET)"; then \
"$(WGET)" http://pear.php.net/install-pear-nozlib.phar -nd -P $(builddir)/; \
elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
"$(FETCH)" -o $(builddir)/ http://pear.php.net/install-pear-nozlib.phar; \
else \
$(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php http://pear.php.net/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
fi \
fi \ fi \
fi fi
@if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \

5
pear/fetch.php
View file

@ -1,4 +1,5 @@
<?php <?php
function usage($argv) { function usage($argv) {
echo "Usage:\n"; echo "Usage:\n";
printf("\tphp %s <http://example.com/file> <localfile>\n", $argv[0]); printf("\tphp %s <http://example.com/file> <localfile>\n", $argv[0]);
@ -22,7 +23,7 @@ function stream_notification_callback($notification_code, $severity, $message, $
break; break;
case STREAM_NOTIFY_CONNECT: case STREAM_NOTIFY_CONNECT:
echo "Conntected...\n"; echo "Connected...\n";
break; break;
case STREAM_NOTIFY_FILE_SIZE_IS: case STREAM_NOTIFY_FILE_SIZE_IS:
@ -58,7 +59,7 @@ if (is_resource($fp) && file_put_contents($argv[2], $fp)) {
} }
$err = error_get_last(); $err = error_get_last();
echo "\nErrrrrorr..\n", $err["message"], "\n"; echo "\nError..\n", $err["message"], "\n";
exit(1); exit(1);