From: Jani Taskinen <jani@php.net>
Date: Thu, 16 Jul 2009 12:19:02 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.2.11RC1~166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae424dbb83c58e36667b24637643189b87569ff4;p=php

MFH
---

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 3812667112..e1fd8d5817 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 e72dab4994..8e097b363d 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