[PHP-CVS] cvs: php-src(PHP_5_3) /pear Makefile.frag fetch.php
cellog Fri May 30 23:42:50 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/pear Makefile.frag fetch.php Log: patch by Christopher Jones: use wget/fetch by default if available, correct typo/Erorr in fetch.php http://cvs.php.net/viewvc.cgi/php-src/pear/Makefile.frag?r1=1.35.6.10.2.2.2.2&r2=1.35.6.10.2.2.2.3&diff_format=u Index: php-src/pear/Makefile.frag diff -u php-src/pear/Makefile.frag:1.35.6.10.2.2.2.2 php-src/pear/Makefile.frag:1.35.6.10.2.2.2.3 --- php-src/pear/Makefile.frag:1.35.6.10.2.2.2.2Mon May 19 15:20:55 2008 +++ php-src/pear/Makefile.frag Fri May 30 23:42:50 2008 @@ -5,6 +5,9 @@ # 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 +WGET = `which wget 2>/dev/null` +FETCH = `which fetch 2>/dev/null` + install-pear-installer: $(SAPI_CLI_PATH) @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" @@ -14,7 +17,13 @@ if test -f $(srcdir)/install-pear-nozlib.phar; then \ cp $(srcdir)/install-pear-nozlib.phar $(builddir)/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; \ + 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 @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ http://cvs.php.net/viewvc.cgi/php-src/pear/fetch.php?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/pear/fetch.php diff -u php-src/pear/fetch.php:1.1.2.1 php-src/pear/fetch.php:1.1.2.2 --- php-src/pear/fetch.php:1.1.2.1 Mon Apr 14 16:56:50 2008 +++ php-src/pear/fetch.php Fri May 30 23:42:50 2008 @@ -1,4 +1,5 @@ http://example.com/file> \n", $argv[0]); @@ -22,7 +23,7 @@ break; case STREAM_NOTIFY_CONNECT: -echo "Conntected...\n"; +echo "Connected...\n"; break; case STREAM_NOTIFY_FILE_SIZE_IS: @@ -58,7 +59,7 @@ } $err = error_get_last(); -echo "\nErorr..\n", $err["message"], "\n"; +echo "\nError..\n", $err["message"], "\n"; exit(1); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /pear Makefile.frag fetch.php
Hannes Magnusson wrote: but I'm fine with using this as a fallback if neither wget or fetch exist. That seems best to me, too. Ideally you'd add proxy support to fetch.php as well :) Chris -- Christopher Jones, Oracle Email: [EMAIL PROTECTED]Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ Free PHP Book: http://tinyurl.com/f8jad -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /pear Makefile.frag fetch.php
On Wed, May 14, 2008 at 8:52 PM, Derick Rethans <[EMAIL PROTECTED]> wrote: > On Mon, 14 Apr 2008, Hannes Magnusson wrote: > >> bjori Mon Apr 14 16:56:51 2008 UTC >> >> Added files: (Branch: PHP_5_3) >> /php-src/pear fetch.php >> >> Modified files: >> /php-src/pear Makefile.frag >> Log: >> Use PHP to fetch the pear phar > > Can we please revert this. wget supports proxies and this fetch.php > thing assumes a standard terminal is wider than 80 chars. I'm fine with > having it as fallback, but wget and "fetch" should be used first. Err. Christopher had already pointed out the lack of proxy support but I simply forgot to fix it. The 80char width is an easy fix too... The reason that prompted this commit was the annoying assumption of wget or fetch existing, plus I was documenting the stream notification stuff :), but I'm fine with using this as a fallback if neither wget or fetch exist. -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /pear Makefile.frag fetch.php
On Mon, 14 Apr 2008, Hannes Magnusson wrote: > bjori Mon Apr 14 16:56:51 2008 UTC > > Added files: (Branch: PHP_5_3) > /php-src/pear fetch.php > > Modified files: > /php-src/pear Makefile.frag > Log: > Use PHP to fetch the pear phar Can we please revert this. wget supports proxies and this fetch.php thing assumes a standard terminal is wider than 80 chars. I'm fine with having it as fallback, but wget and "fetch" should be used first. > @@ -16,15 +14,7 @@ > if test -f $(srcdir)/install-pear-nozlib.phar; then \ > 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/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 \ > - echo ""; \ > - echo "No download utilities found. Don't know > how to download PEAR archive."; \ > - echo ""; \ ie, put it here, if wget and fetch are not found. regards, Derick -- Derick Rethans http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /pear Makefile.frag fetch.php
bjori Mon Apr 14 16:56:51 2008 UTC Added files: (Branch: PHP_5_3) /php-src/pear fetch.php Modified files: /php-src/pear Makefile.frag Log: Use PHP to fetch the pear phar http://cvs.php.net/viewvc.cgi/php-src/pear/Makefile.frag?r1=1.35.6.10.2.2&r2=1.35.6.10.2.2.2.1&diff_format=u Index: php-src/pear/Makefile.frag diff -u php-src/pear/Makefile.frag:1.35.6.10.2.2 php-src/pear/Makefile.frag:1.35.6.10.2.2.2.1 --- php-src/pear/Makefile.frag:1.35.6.10.2.2Wed Nov 8 19:05:41 2006 +++ php-src/pear/Makefile.frag Mon Apr 14 16:56:50 2008 @@ -4,8 +4,6 @@ # Skip all php.ini files altogether PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 -WGET = `which wget 2>/dev/null` -FETCH = `which fetch 2>/dev/null` install-pear-installer: $(SAPI_CLI_PATH) @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" @@ -16,15 +14,7 @@ if test -f $(srcdir)/install-pear-nozlib.phar; then \ 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/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 \ - echo ""; \ - echo "No download utilities found. Don't know how to download PEAR archive."; \ - echo ""; \ - fi \ + $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php http://pear.php.net/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ fi \ fi @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ http://cvs.php.net/viewvc.cgi/php-src/pear/fetch.php?view=markup&rev=1.1 Index: php-src/pear/fetch.php +++ php-src/pear/fetch.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
