php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed no bailout address error and posix tests

Browse Source
This commit is contained in:
Felipe Pena
2010-11-02 18:06:39 +00:00
parent 2bbcc005c7
commit 4667771a5f
6 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/posix/tests/posix_access.phpt
-2
View File
@@ -17,8 +17,6 @@ if (PHP_VERSION_ID < 503099) {
die('SKIP Safe mode is no longer available.');
}
?>
--INI--
safe_mode = 1
--FILE--
<?php
$filename = dirname(__FILE__) . '/foo.test';
ext/posix/tests/posix_access_error_modes.phpt
-2
View File
@@ -17,8 +17,6 @@ if (PHP_VERSION_ID < 503099) {
die('SKIP Safe mode is no longer available.');
}
?>
--INI--
safe_mode = 1
--FILE--
<?php
$filename = dirname(__FILE__) . '/foo.test';
ext/posix/tests/posix_access_error_wrongparams.phpt
-2
View File
@@ -17,8 +17,6 @@ if (PHP_VERSION_ID < 503099) {
die('SKIP Safe mode is no longer available.');
}
?>
--INI--
safe_mode = 1
--FILE--
<?php
ext/posix/tests/posix_access_safemode.phpt
-2
View File
@@ -14,8 +14,6 @@ if (posix_geteuid() == 0) {
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));
ext/posix/tests/posix_mkfifo_safemode.phpt
-2
View File
@@ -21,8 +21,6 @@ if (PHP_VERSION_ID < 503099) {
die('SKIP Safe mode is no longer available.');
}
?>
--INI--
safe_mode = 1
--FILE--
<?php
var_dump(posix_mkfifo('/tmp/foobar', 0644));
main/main.c
+16 -12
View File
@@ -1825,7 +1825,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
{
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 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
};
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 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
zend_interned_strings_snapshot(TSRMLS_C);
/* we're done */
return SUCCESS;
return retval;
}
/* }}} */