hi Jani, Please copy the full commit msg instead of only MFH.
Cheers, On Thu, Jul 16, 2009 at 2:25 PM, Jani Taskinen<j...@php.net> wrote: > jani Thu, 16 Jul 2009 12:25:17 +0000 > > URL: http://svn.php.net/viewvc?view=revision&revision=284189 > > Changed paths: > U php/php-src/branches/PHP_5_3/Zend/zend_ini.c > U php/php-src/branches/PHP_5_3/build/build.mk > U php/php-src/branches/PHP_5_3/build/buildcheck.sh > > Log: > MFH > > Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini.c > =================================================================== > --- php/php-src/branches/PHP_5_3/Zend/zend_ini.c 2009-07-16 12:19:02 > UTC (rev 284188) > +++ php/php-src/branches/PHP_5_3/Zend/zend_ini.c 2009-07-16 12:25:17 > UTC (rev 284189) > @@ -47,6 +47,7 @@ > static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage > TSRMLS_DC) /* {{{ */ > { > int result = FAILURE; > + > if (ini_entry->modified) { > if (ini_entry->on_modify) { > zend_try { > @@ -56,7 +57,7 @@ > result = ini_entry->on_modify(ini_entry, > ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, > ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC); > } zend_end_try(); > } > - if(stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) { > + if (stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) { > /* runtime failure is OK */ > return 1; > } > > Modified: php/php-src/branches/PHP_5_3/build/build.mk > =================================================================== > --- php/php-src/branches/PHP_5_3/build/build.mk 2009-07-16 12:19:02 UTC (rev > 284188) > +++ php/php-src/branches/PHP_5_3/build/build.mk 2009-07-16 12:25:17 UTC (rev > 284189) > @@ -71,8 +71,8 @@ > done > > svnclean-work: > - @for i in `find . -type d -and -not -path '*/.svn/*'`; do \ > - (cd `dirname $$i` 2>/dev/null && svn propget svn:ignore $$i | > xargs rm -rf && rm -rf *.o *.a .libs || true); \ > + @for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do > \ > + (cd `dirname $$i` 2>/dev/null && rm -rf `svn propget > svn:ignore . | grep -v config.nice` *.o *.a .libs || true); \ > done > > gitclean-work: > > Modified: php/php-src/branches/PHP_5_3/build/buildcheck.sh > =================================================================== > --- php/php-src/branches/PHP_5_3/build/buildcheck.sh 2009-07-16 12:19:02 > UTC (rev 284188) > +++ php/php-src/branches/PHP_5_3/build/buildcheck.sh 2009-07-16 12:25:17 > UTC (rev 284189) > @@ -48,9 +48,9 @@ > > if test "$1" = "2" && test "$2" -ge "50"; then > echo "buildconf: Your version of autoconf likely contains buggy cache code." > - echo " Running svnclean for you." > + echo " Running vcsclean for you." > echo " To avoid this, install autoconf-2.13." > - ./svnclean > + ./vcsclean > stamp= > fi > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
