summaryrefslogtreecommitdiff
path: root/Zend/zend_ini.c
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2007-06-08 14:47:45 +0000
committerAntony Dovgal <tony2001@php.net>2007-06-08 14:47:45 +0000
commit0ca8dab47df2b99abb631ea7fc56e7d58b977992 (patch)
tree0d10c43528170d709e64b4f5655f030dcb5ced4c /Zend/zend_ini.c
parentc8d54ca3fe327441cd3b3868538da9d25497aa08 (diff)
downloadphp-git-0ca8dab47df2b99abb631ea7fc56e7d58b977992.tar.gz
MFH: fix #41561 (Values set with php_admin_* in httpd.conf can be overwritten with ini_set())
Diffstat (limited to 'Zend/zend_ini.c')
-rw-r--r--Zend/zend_ini.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 4e05cec4d7..c559e661e4 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -244,6 +244,10 @@ ZEND_API int zend_alter_ini_entry(char *name, uint name_length, char *new_value,
return FAILURE;
}
+ if (stage == ZEND_INI_STAGE_ACTIVATE && modify_type == ZEND_INI_SYSTEM) {
+ ini_entry->modifiable = ZEND_INI_SYSTEM;
+ }
+
duplicate = estrndup(new_value, new_value_length);
if (!ini_entry->on_modify