felipe Tue, 02 Nov 2010 18:06:39 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305033
Log:
- Fixed no bailout address error and posix tests
Changed paths:
U php/php-src/trunk/ext/posix/tests/posix_access.phpt
U php/php-src/trunk/ext/posix/tests/posix_access_error_modes.phpt
U php/php-src/trunk/ext/posix/tests/posix_access_error_wrongparams.phpt
U php/php-src/trunk/ext/posix/tests/posix_access_safemode.phpt
U php/php-src/trunk/ext/posix/tests/posix_mkfifo_safemode.phpt
U php/php-src/trunk/main/main.c
Modified: php/php-src/trunk/ext/posix/tests/posix_access.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_access.phpt 2010-11-02 17:50:39 UTC
(rev 305032)
+++ php/php-src/trunk/ext/posix/tests/posix_access.phpt 2010-11-02 18:06:39 UTC
(rev 305033)
@@ -17,8 +17,6 @@
die('SKIP Safe mode is no longer available.');
}
?>
---INI--
-safe_mode = 1
--FILE--
<?php
$filename = dirname(__FILE__) . '/foo.test';
Modified: php/php-src/trunk/ext/posix/tests/posix_access_error_modes.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_access_error_modes.phpt
2010-11-02 17:50:39 UTC (rev 305032)
+++ php/php-src/trunk/ext/posix/tests/posix_access_error_modes.phpt
2010-11-02 18:06:39 UTC (rev 305033)
@@ -17,8 +17,6 @@
die('SKIP Safe mode is no longer available.');
}
?>
---INI--
-safe_mode = 1
--FILE--
<?php
$filename = dirname(__FILE__) . '/foo.test';
Modified: php/php-src/trunk/ext/posix/tests/posix_access_error_wrongparams.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_access_error_wrongparams.phpt
2010-11-02 17:50:39 UTC (rev 305032)
+++ php/php-src/trunk/ext/posix/tests/posix_access_error_wrongparams.phpt
2010-11-02 18:06:39 UTC (rev 305033)
@@ -17,8 +17,6 @@
die('SKIP Safe mode is no longer available.');
}
?>
---INI--
-safe_mode = 1
--FILE--
<?php
Modified: php/php-src/trunk/ext/posix/tests/posix_access_safemode.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_access_safemode.phpt
2010-11-02 17:50:39 UTC (rev 305032)
+++ php/php-src/trunk/ext/posix/tests/posix_access_safemode.phpt
2010-11-02 18:06:39 UTC (rev 305033)
@@ -14,8 +14,6 @@
if (PHP_VERSION_ID < 503099) {
die('SKIP Safe mode is no longer available.');
}
---INI--
-safe_mode = 1
--FILE--
<?php
var_dump(posix_access('/tmp', POSIX_W_OK));
Modified: php/php-src/trunk/ext/posix/tests/posix_mkfifo_safemode.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_mkfifo_safemode.phpt
2010-11-02 17:50:39 UTC (rev 305032)
+++ php/php-src/trunk/ext/posix/tests/posix_mkfifo_safemode.phpt
2010-11-02 18:06:39 UTC (rev 305033)
@@ -21,8 +21,6 @@
die('SKIP Safe mode is no longer available.');
}
?>
---INI--
-safe_mode = 1
--FILE--
<?php
var_dump(posix_mkfifo('/tmp/foobar', 0644));
Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c 2010-11-02 17:50:39 UTC (rev 305032)
+++ php/php-src/trunk/main/main.c 2010-11-02 18:06:39 UTC (rev 305033)
@@ -1825,7 +1825,7 @@
{
zend_utility_functions zuf;
zend_utility_values zuv;
- int module_number=0; /* for REGISTER_INI_ENTRIES() */
+ int retval = SUCCESS, module_number=0; /* for REGISTER_INI_ENTRIES() */
char *php_os;
zend_module_entry *module;
#ifdef ZTS
@@ -2135,21 +2135,25 @@
};
unsigned int i;
+
+ zend_try {
+ /* 2 = Count of deprecation structs */
+ for (i = 0; i < 2; i++) {
+ const char **p = directives[i].directives;
- /* 2 = Count of deprecation structs */
- for (i = 0; i < 2; i++) {
- const char **p = directives[i].directives;
+ while(*p) {
+ long value;
- while(*p) {
- long value;
+ if (cfg_get_long((char*)*p, &value) ==
SUCCESS && value) {
+
zend_error(directives[i].error_level, directives[i].phrase, *p);
+ }
- if (cfg_get_long((char*)*p, &value) == SUCCESS
&& value) {
- zend_error(directives[i].error_level,
directives[i].phrase, *p);
+ ++p;
}
-
- ++p;
}
- }
+ } zend_catch {
+ retval = FAILURE;
+ } zend_end_try();
}
sapi_deactivate(TSRMLS_C);
@@ -2159,7 +2163,7 @@
zend_interned_strings_snapshot(TSRMLS_C);
/* we're done */
- return SUCCESS;
+ return retval;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
