summaryrefslogtreecommitdiff
path: root/Zend/zend_ini.c
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2007-09-07 09:37:38 +0000
committerJani Taskinen <jani@php.net>2007-09-07 09:37:38 +0000
commit82626c186872e6005c89dfc67d5e4061a351e4d9 (patch)
treed16f4bc8a924d4fcad770c91ede1fbfe2d356760 /Zend/zend_ini.c
parent510ad20616348f01dc59178395aa7c2591b65373 (diff)
downloadphp-git-82626c186872e6005c89dfc67d5e4061a351e4d9.tar.gz
MFH: - Fixed the rest of bug #41561 ( @ operator not working )
Diffstat (limited to 'Zend/zend_ini.c')
-rw-r--r--Zend/zend_ini.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index e8a38538dd..3237776026 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -234,7 +234,7 @@ ZEND_API void zend_ini_refresh_caches(int stage TSRMLS_DC) /* {{{ */
/* }}} */
#endif
-ZEND_API int zend_alter_ini_entry(char *name, uint name_length, char *new_value, uint new_value_length, int modify_type, int stage) /* {{{ */
+ZEND_API int zend_alter_ini_entry_ex(char *name, uint name_length, char *new_value, uint new_value_length, int modify_type, int stage, int force_change) /* {{{ */
{
zend_ini_entry *ini_entry;
char *duplicate;
@@ -249,8 +249,10 @@ ZEND_API int zend_alter_ini_entry(char *name, uint name_length, char *new_value,
ini_entry->modifiable = ZEND_INI_SYSTEM;
}
- if (!(ini_entry->modifiable & modify_type)) {
- return FAILURE;
+ if (!force_change) {
+ if (!(ini_entry->modifiable & modify_type)) {
+ return FAILURE;
+ }
}
modified = ini_entry->modified;