diff options
| author | Jani Taskinen <jani@php.net> | 2009-07-16 12:25:17 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-07-16 12:25:17 +0000 |
| commit | ecdd8ebbb9a9cc1f31974ac86feb725455c80f42 (patch) | |
| tree | 306a3dc11bf56d64291cc96fd1bfa7bfd7a36205 | |
| parent | 24f9b1bd1e51253acd731367986ee2041bdfc4f7 (diff) | |
| download | php-git-ecdd8ebbb9a9cc1f31974ac86feb725455c80f42.tar.gz | |
MFH
| -rw-r--r-- | Zend/zend_ini.c | 3 | ||||
| -rw-r--r-- | build/build.mk | 4 | ||||
| -rwxr-xr-x | build/buildcheck.sh | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 604e74f6e1..2b32ac688a 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -47,6 +47,7 @@ static int zend_remove_ini_entries(zend_ini_entry *ini_entry, int *module_number 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 @@ static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage TSRMLS 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; } diff --git a/build/build.mk b/build/build.mk index 91143cb1f7..c178813682 100644 --- a/build/build.mk +++ b/build/build.mk @@ -71,8 +71,8 @@ cvsclean-work: 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: diff --git a/build/buildcheck.sh b/build/buildcheck.sh index a3b8fef6e9..4d76bf24d4 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -48,9 +48,9 @@ fi 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 |