fix ini_restore problem

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 6faf495263f7128fa3773c381b464028e4d2354c..3812667112089ba42c1ff90e728d145d4cfc7284 100644 (file)
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -46,15 +46,20 @@ 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 {
                        /* even if on_modify bails out, we have to continue on with restoring,
                                since there can be allocated variables that would be freed on MM shutdown
                                and would lead to memory corruption later ini entry is modified again */
-                               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();
                }
+               if(stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
+                       /* runtime failure is OK */
+                       return 1;
+               }
                if (ini_entry->value != ini_entry->orig_value) {
                        efree(ini_entry->value);
                }