summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-05-22 11:34:21 +0000
committerZeev Suraski <zeev@php.net>1999-05-22 11:34:21 +0000
commit9df57a226389147f82b714b5aa483156f4ac6a3b (patch)
tree8a15274548ff0fbd6abc1b82dd27aa4161f54150
parent080105f79f73512f4a30820403821e416affe98e (diff)
downloadphp-git-9df57a226389147f82b714b5aa483156f4ac6a3b.tar.gz
php_ini fixes
-rw-r--r--main/php_ini.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index 91c29e0f15..3acac20c32 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -55,6 +55,9 @@ static int php_remove_ini_entries(php_ini_entry *ini_entry, int *module_number)
static int php_restore_ini_entry_cb(php_ini_entry *ini_entry)
{
if (ini_entry->modified) {
+ if (ini_entry->on_modify) {
+ 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);
+ }
efree(ini_entry->value);
ini_entry->value = ini_entry->orig_value;
ini_entry->value_length = ini_entry->orig_value_length;
@@ -176,9 +179,7 @@ PHPAPI int php_restore_ini_entry(char *name, uint name_length)
}
if (ini_entry->orig_value) {
- STR_FREE(ini_entry->value);
- ini_entry->value = ini_entry->orig_value;
- ini_entry->value_length = ini_entry->orig_value_length;
+ php_restore_ini_entry_cb(ini_entry);
}
return SUCCESS;
}