fix #41561 (Values set with php_admin_* in httpd.conf can be overwritten with ini_set())

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index c4915d6cd6fc051077fb31db40b78455d5f683df..57845d3789876f1b19c9037f6687b0d0bd1e400a 100644 (file)
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -245,6 +245,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