This commit is contained in:
Jani Taskinen 2009-07-16 12:18:13 +00:00
parent ae3433a77f
commit 24d327ba2b

View File

@ -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) /* {{{ */ static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage TSRMLS_DC) /* {{{ */
{ {
int result = FAILURE; int result = FAILURE;
if (ini_entry->modified) { if (ini_entry->modified) {
if (ini_entry->on_modify) { if (ini_entry->on_modify) {
zend_try { 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); 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(); } zend_end_try();
} }
if(stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) { if (stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
/* runtime failure is OK */ /* runtime failure is OK */
return 1; return 1;
} }