Alternative to phpGH-19963

iluuu1994 · iluuu1994 · commit 557e70f5490a · 2025-09-26T00:35:10.000+02:00
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
@@ -58,7 +58,7 @@ static zend_result zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stag
 			/* 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 */
-				result = ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage);
+				result = ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage, NULL);
 			} zend_end_try();
 		}
 		if (stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
@@ -249,21 +249,20 @@ ZEND_API zend_result zend_register_ini_entries_ex(const zend_ini_entry_def *ini_
 			return FAILURE;
 		}
 
-		zend_string *prev_value = p->value;
-
+		bool modified = false;
 		if (((default_value = zend_get_configuration_directive(p->name)) != NULL) &&
-		    (!p->on_modify || p->on_modify(p, Z_STR_P(default_value), p->mh_arg1, p->mh_arg2, p->mh_arg3, ZEND_INI_STAGE_STARTUP) == SUCCESS)) {
+		    (!p->on_modify || p->on_modify(p, Z_STR_P(default_value), p->mh_arg1, p->mh_arg2, p->mh_arg3, ZEND_INI_STAGE_STARTUP, &modified) == SUCCESS)) {
 
 			/* Skip assigning the value if the handler has already done so. */
-			if (p->value == prev_value) {
+			if (!modified) {
 				p->value = zend_new_interned_string(zend_string_copy(Z_STR_P(default_value)));
 			}
 		} else {
 			p->value = ini_entry->value ?
 				zend_string_init_interned(ini_entry->value, ini_entry->value_length, 1) : NULL;
 
 			if (p->on_modify) {
-				p->on_modify(p, p->value, p->mh_arg1, p->mh_arg2, p->mh_arg3, ZEND_INI_STAGE_STARTUP);
+				p->on_modify(p, p->value, p->mh_arg1, p->mh_arg2, p->mh_arg3, ZEND_INI_STAGE_STARTUP, NULL);
 			}
 		}
 		ini_entry++;
@@ -398,13 +397,14 @@ ZEND_API zend_result zend_alter_ini_entry_ex(zend_string *name, zend_string *new
 	zend_string *prev_value = ini_entry->value;
 	duplicate = zend_string_copy(new_value);
 
+	bool changed_by_on_modify = false;
 	if (!ini_entry->on_modify
-		|| ini_entry->on_modify(ini_entry, duplicate, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage) == SUCCESS) {
+		|| ini_entry->on_modify(ini_entry, duplicate, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage, &changed_by_on_modify) == SUCCESS) {
 		if (modified && ini_entry->orig_value != prev_value) { /* we already changed the value, free the changed value */
 			zend_string_release(prev_value);
 		}
 		/* Skip assigning the value if the handler has already done so. */
-		if (ini_entry->value == prev_value) {
+		if (!changed_by_on_modify) {
 			ini_entry->value = duplicate;
 		} else {
 			zend_string_release(duplicate);
diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
@@ -27,7 +27,7 @@
 
 #define ZEND_INI_ALL (ZEND_INI_USER|ZEND_INI_PERDIR|ZEND_INI_SYSTEM)
 
-#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, zend_string *new_value, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage)
+#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, zend_string *new_value, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage, bool *modified)
 #define ZEND_INI_DISP(name) ZEND_COLD void name(zend_ini_entry *ini_entry, int type)
 
 typedef struct _zend_ini_entry_def {
diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c
@@ -145,7 +145,7 @@ static ZEND_INI_MH(OnAutoregisterCasesensitive)
 		php_error_docref("com.configuration", E_WARNING, "Declaration of case-insensitive constants is no longer supported");
 		return FAILURE;
 	}
-	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 
 PHP_INI_BEGIN()
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -541,7 +541,7 @@ static PHP_INI_MH(OnUpdate_date_timezone)
 		return FAILURE;
 	}
 
-	if (OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage) == FAILURE) {
+	if (OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified) == FAILURE) {
 		return FAILURE;
 	}
 
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
@@ -363,7 +363,7 @@ static ZEND_INI_MH(OnUpdateDefaultHandler)
 
 	if (!ZSTR_LEN(new_value)) {
 		DBA_G(default_hptr) = NULL;
-		return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+		return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	}
 
 	for (hptr = handler; hptr->name && strcasecmp(hptr->name, ZSTR_VAL(new_value)); hptr++);
@@ -373,7 +373,7 @@ static ZEND_INI_MH(OnUpdateDefaultHandler)
 		return FAILURE;
 	}
 	DBA_G(default_hptr) = hptr;
-	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 
 PHP_INI_BEGIN()
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
@@ -117,7 +117,7 @@ ZEND_INI_MH(OnUpdateEncode)
 		}
 		pefree((void *) return_list, 0);
 	}
-	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 
 ZEND_INI_MH(OnUpdateDecode)
@@ -132,7 +132,7 @@ ZEND_INI_MH(OnUpdateDecode)
 		}
 		pefree((void *) return_list, 0);
 	}
-	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 
 PHP_INI_BEGIN()
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
@@ -174,7 +174,7 @@ static PHP_INI_MH(OnUpdateInputEncoding)
 	if (stage & (PHP_INI_STAGE_ACTIVATE | PHP_INI_STAGE_RUNTIME)) {
 		php_error_docref("ref.iconv", E_DEPRECATED, "Use of iconv.input_encoding is deprecated");
 	}
-	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	return SUCCESS;
 }
 
@@ -187,7 +187,7 @@ static PHP_INI_MH(OnUpdateOutputEncoding)
 	if (stage & (PHP_INI_STAGE_ACTIVATE | PHP_INI_STAGE_RUNTIME)) {
 		php_error_docref("ref.iconv", E_DEPRECATED, "Use of iconv.output_encoding is deprecated");
 	}
-	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	return SUCCESS;
 }
 
@@ -200,7 +200,7 @@ static PHP_INI_MH(OnUpdateInternalEncoding)
 	if (stage & (PHP_INI_STAGE_ACTIVATE | PHP_INI_STAGE_RUNTIME)) {
 		php_error_docref("ref.iconv", E_DEPRECATED, "Use of iconv.internal_encoding is deprecated");
 	}
-	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	return SUCCESS;
 }
 
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -825,7 +825,7 @@ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding)
 		php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.internal_encoding is deprecated");
 	}
 
-	if (OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage) == FAILURE) {
+	if (OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified) == FAILURE) {
 		return FAILURE;
 	}
 
@@ -884,7 +884,7 @@ static PHP_INI_MH(OnUpdate_mbstring_encoding_translation)
 		return FAILURE;
 	}
 
-	OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 
 	if (MBSTRG(encoding_translation)) {
 		sapi_unregister_post_entry(php_post_entries);
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -264,7 +264,7 @@ void zend_accel_schedule_restart_if_necessary(zend_accel_restart_reason reason)
  */
 static ZEND_INI_MH(accel_include_path_on_modify)
 {
-	int ret = orig_include_path_on_modify(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	int ret = orig_include_path_on_modify(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 
 	if (ret == SUCCESS) {
 		ZCG(include_path) = new_value;
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -157,7 +157,7 @@ static ZEND_INI_MH(OnEnable)
 	if (stage == ZEND_INI_STAGE_STARTUP ||
 	    stage == ZEND_INI_STAGE_SHUTDOWN ||
 	    stage == ZEND_INI_STAGE_DEACTIVATE) {
-		return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+		return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	} else {
 		/* It may be only temporarily disabled */
 		bool *p = (bool *) ZEND_INI_GET_ADDR();
@@ -192,15 +192,15 @@ static ZEND_INI_MH(OnUpdateFileCache)
 			new_value = NULL;
 		}
 	}
-	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	return SUCCESS;
 }
 
 #ifdef HAVE_JIT
 static ZEND_INI_MH(OnUpdateJit)
 {
 	if (zend_jit_config(new_value, stage) == SUCCESS) {
-		return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+		return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	}
 	return FAILURE;
 }
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
@@ -314,7 +314,7 @@ static PHP_GSHUTDOWN_FUNCTION(pcre) /* {{{ */
 
 static PHP_INI_MH(OnUpdateBacktrackLimit)
 {/*{{{*/
-	OnUpdateLong(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateLong(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	if (mctx) {
 		pcre2_set_match_limit(mctx, (uint32_t)PCRE_G(backtrack_limit));
 	}
@@ -324,7 +324,7 @@ static PHP_INI_MH(OnUpdateBacktrackLimit)
 
 static PHP_INI_MH(OnUpdateRecursionLimit)
 {/*{{{*/
-	OnUpdateLong(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateLong(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	if (mctx) {
 		pcre2_set_depth_limit(mctx, (uint32_t)PCRE_G(recursion_limit));
 	}
@@ -335,7 +335,7 @@ static PHP_INI_MH(OnUpdateRecursionLimit)
 #ifdef HAVE_PCRE_JIT_SUPPORT
 static PHP_INI_MH(OnUpdateJit)
 {/*{{{*/
-	OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	if (PCRE_G(jit) && jit_stack) {
 		pcre2_jit_stack_assign(mctx, NULL, jit_stack);
 	} else {
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -737,7 +737,7 @@ static PHP_INI_MH(OnUpdateSessionLong)
 {
 	SESSION_CHECK_ACTIVE_STATE;
 	SESSION_CHECK_OUTPUT_STATE;
-	return OnUpdateLong(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateLong(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 
 static PHP_INI_MH(OnUpdateSessionStr)
@@ -752,7 +752,7 @@ static PHP_INI_MH(OnUpdateSessionBool)
 {
 	SESSION_CHECK_ACTIVE_STATE;
 	SESSION_CHECK_OUTPUT_STATE;
-	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 
 
@@ -886,7 +886,7 @@ static PHP_INI_MH(OnUpdateRefererCheck)
 	if (ZSTR_LEN(new_value) != 0) {
 		php_error_docref("session.configuration", E_DEPRECATED, "Usage of session.referer_check INI setting is deprecated");
 	}
-	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 
 PHP_INI_BEGIN()
@@ -1527,15 +1527,15 @@ static bool php_can_change_session_setting(const char *setting_name, bool check_
 
 		return false;
 	}
-	
+
 	if (SG(headers_sent) && (!check_cookies || PS(use_cookies))) {
 		char error_msg[256];
 		snprintf(error_msg, sizeof(error_msg), "Session %s cannot be changed after headers have already been sent", setting_name);
 		php_session_headers_already_sent_error(E_WARNING, error_msg);
 
 		return false;
 	}
-	
+
 	return true;
 }
 
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -378,7 +378,7 @@ static PHP_INI_MH(OnUpdateCacheDir)
 		}
 	}
 
-	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	return SUCCESS;
 }
 
diff --git a/ext/standard/file.c b/ext/standard/file.c
@@ -145,7 +145,7 @@ static PHP_INI_MH(OnUpdateAutoDetectLineEndings)
 	if (zend_ini_parse_bool(new_value)) {
 		zend_error(E_DEPRECATED, "auto_detect_line_endings is deprecated");
 	}
-	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 
 PHP_INI_BEGIN()
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
@@ -894,7 +894,7 @@ static PHP_INI_MH(php_tidy_set_clean_output)
 		}
 	}
 
-	status = OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	status = OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 
 	if (stage == PHP_INI_STAGE_RUNTIME && value) {
 		if (!php_output_handler_started(ZEND_STRL("ob_tidyhandler"))) {
diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c
@@ -911,7 +911,7 @@ static PHP_INI_MH(OnUpdateZendTestObserveOplineInZendMM)
 	} else {
 		zend_test_reset_heap(ZEND_MODULE_GLOBALS_BULK(zend_test));
 	}
-	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 
 static ZEND_FUNCTION(zend_test_fill_packed_array)
diff --git a/ext/zend_test/zend_mm_custom_handlers.c b/ext/zend_test/zend_mm_custom_handlers.c
@@ -163,7 +163,7 @@ static PHP_INI_MH(OnUpdateZendTestMMCustomHandlersEnabled)
 	} else {
 		zend_test_mm_custom_handlers_shutdown();
 	}
-	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 
 PHP_INI_BEGIN()
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
@@ -1315,7 +1315,7 @@ static PHP_INI_MH(OnUpdate_zlib_output_handler)
 		return FAILURE;
 	}
 
-	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 /* }}} */
 
diff --git a/main/main.c b/main/main.c
@@ -348,6 +348,7 @@ static PHP_INI_MH(OnChangeMemoryLimit)
 		zend_ini_entry *max_mem_limit_ini = zend_hash_str_find_ptr(EG(ini_directives), ZEND_STRL("max_memory_limit"));
 		entry->value = zend_string_copy(max_mem_limit_ini->value);
 		PG(memory_limit) = PG(max_memory_limit);
+		*modified = true;
 
 		return SUCCESS;
 	}
@@ -607,7 +608,7 @@ static PHP_INI_MH(OnUpdateDefaultCharset)
 		|| strpbrk(ZSTR_VAL(new_value), "\r\n")) {
 		return FAILURE;
 	}
-	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	if (php_internal_encoding_changed) {
 		php_internal_encoding_changed();
 	}
@@ -627,14 +628,14 @@ static PHP_INI_MH(OnUpdateDefaultMimeTye)
 		|| strpbrk(ZSTR_VAL(new_value), "\r\n")) {
 		return FAILURE;
 	}
-	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 }
 /* }}} */
 
 /* {{{ PHP_INI_MH */
 static PHP_INI_MH(OnUpdateInternalEncoding)
 {
-	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	if (php_internal_encoding_changed) {
 		php_internal_encoding_changed();
 	}
@@ -650,7 +651,7 @@ static PHP_INI_MH(OnUpdateInternalEncoding)
 /* {{{ PHP_INI_MH */
 static PHP_INI_MH(OnUpdateInputEncoding)
 {
-	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	if (php_internal_encoding_changed) {
 		php_internal_encoding_changed();
 	}
@@ -679,7 +680,7 @@ static PHP_INI_MH(OnUpdateReportMemleaks)
 /* {{{ PHP_INI_MH */
 static PHP_INI_MH(OnUpdateOutputEncoding)
 {
-	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	if (php_internal_encoding_changed) {
 		php_internal_encoding_changed();
 	}
@@ -747,7 +748,7 @@ static PHP_INI_MH(OnUpdateMailCrLfMode)
 			return FAILURE;
 		}
 	}
-	OnUpdateStr(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+	OnUpdateStr(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);
 	return SUCCESS;
 }
 /* }}} */
diff --git a/sapi/fpm/fpm/fpm_php.c b/sapi/fpm/fpm/fpm_php.c
diff --git a/tests/basic/gh17951_runtime_change_6.phpt b/tests/basic/gh17951_runtime_change_6.phpt

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ static ZEND_INI_MH(OnAutoregisterCasesensitive)`
`145`	`145`	`php_error_docref("com.configuration", E_WARNING, "Declaration of case-insensitive constants is no longer supported");`
`146`	`146`	`return FAILURE;`
`147`	`147`	`}`
`148`		`- return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`148`	`+ return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`PHP_INI_BEGIN()`
Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ static PHP_INI_MH(OnUpdate_date_timezone)`
`541`	`541`	`return FAILURE;`
`542`	`542`	`}`
`543`	`543`
`544`		`- if (OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage) == FAILURE) {`
	`544`	`+ if (OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified) == FAILURE) {`
`545`	`545`	`return FAILURE;`
`546`	`546`	`}`
`547`	`547`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ static ZEND_INI_MH(OnUpdateDefaultHandler)`
`363`	`363`
`364`	`364`	`if (!ZSTR_LEN(new_value)) {`
`365`	`365`	`DBA_G(default_hptr) = NULL;`
`366`		`- return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`366`	`+ return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`for (hptr = handler; hptr->name && strcasecmp(hptr->name, ZSTR_VAL(new_value)); hptr++);`
`@@ -373,7 +373,7 @@ static ZEND_INI_MH(OnUpdateDefaultHandler)`
`373`	`373`	`return FAILURE;`
`374`	`374`	`}`
`375`	`375`	`DBA_G(default_hptr) = hptr;`
`376`		`- return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`376`	`+ return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`PHP_INI_BEGIN()`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ ZEND_INI_MH(OnUpdateEncode)`
`117`	`117`	`}`
`118`	`118`	`pefree((void *) return_list, 0);`
`119`	`119`	`}`
`120`		`- return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`120`	`+ return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`ZEND_INI_MH(OnUpdateDecode)`
`@@ -132,7 +132,7 @@ ZEND_INI_MH(OnUpdateDecode)`
`132`	`132`	`}`
`133`	`133`	`pefree((void *) return_list, 0);`
`134`	`134`	`}`
`135`		`- return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`135`	`+ return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`PHP_INI_BEGIN()`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ static PHP_INI_MH(OnUpdateInputEncoding)`
`174`	`174`	`if (stage & (PHP_INI_STAGE_ACTIVATE \| PHP_INI_STAGE_RUNTIME)) {`
`175`	`175`	`php_error_docref("ref.iconv", E_DEPRECATED, "Use of iconv.input_encoding is deprecated");`
`176`	`176`	`}`
`177`		`- OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`177`	`+ OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`178`	`178`	`return SUCCESS;`
`179`	`179`	`}`
`180`	`180`
`@@ -187,7 +187,7 @@ static PHP_INI_MH(OnUpdateOutputEncoding)`
`187`	`187`	`if (stage & (PHP_INI_STAGE_ACTIVATE \| PHP_INI_STAGE_RUNTIME)) {`
`188`	`188`	`php_error_docref("ref.iconv", E_DEPRECATED, "Use of iconv.output_encoding is deprecated");`
`189`	`189`	`}`
`190`		`- OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`190`	`+ OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`191`	`191`	`return SUCCESS;`
`192`	`192`	`}`
`193`	`193`
`@@ -200,7 +200,7 @@ static PHP_INI_MH(OnUpdateInternalEncoding)`
`200`	`200`	`if (stage & (PHP_INI_STAGE_ACTIVATE \| PHP_INI_STAGE_RUNTIME)) {`
`201`	`201`	`php_error_docref("ref.iconv", E_DEPRECATED, "Use of iconv.internal_encoding is deprecated");`
`202`	`202`	`}`
`203`		`- OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`203`	`+ OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`204`	`204`	`return SUCCESS;`
`205`	`205`	`}`
`206`	`206`
Original file line number	Diff line number	Diff line change
`@@ -825,7 +825,7 @@ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding)`
`825`	`825`	`php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.internal_encoding is deprecated");`
`826`	`826`	`}`
`827`	`827`
`828`		`- if (OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage) == FAILURE) {`
	`828`	`+ if (OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified) == FAILURE) {`
`829`	`829`	`return FAILURE;`
`830`	`830`	`}`
`831`	`831`
`@@ -884,7 +884,7 @@ static PHP_INI_MH(OnUpdate_mbstring_encoding_translation)`
`884`	`884`	`return FAILURE;`
`885`	`885`	`}`
`886`	`886`
`887`		`- OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`887`	`+ OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`888`	`888`
`889`	`889`	`if (MBSTRG(encoding_translation)) {`
`890`	`890`	`sapi_unregister_post_entry(php_post_entries);`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ void zend_accel_schedule_restart_if_necessary(zend_accel_restart_reason reason)`
`264`	`264`	`*/`
`265`	`265`	`static ZEND_INI_MH(accel_include_path_on_modify)`
`266`	`266`	`{`
`267`		`- int ret = orig_include_path_on_modify(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`267`	`+ int ret = orig_include_path_on_modify(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`268`	`268`
`269`	`269`	`if (ret == SUCCESS) {`
`270`	`270`	`ZCG(include_path) = new_value;`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ static ZEND_INI_MH(OnEnable)`
`157`	`157`	`if (stage == ZEND_INI_STAGE_STARTUP \|\|`
`158`	`158`	`stage == ZEND_INI_STAGE_SHUTDOWN \|\|`
`159`	`159`	`stage == ZEND_INI_STAGE_DEACTIVATE) {`
`160`		`- return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`160`	`+ return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`161`	`161`	`} else {`
`162`	`162`	`/* It may be only temporarily disabled */`
`163`	`163`	`bool p = (bool ) ZEND_INI_GET_ADDR();`
`@@ -192,15 +192,15 @@ static ZEND_INI_MH(OnUpdateFileCache)`
`192`	`192`	`new_value = NULL;`
`193`	`193`	`}`
`194`	`194`	`}`
`195`		`- OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`195`	`+ OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`196`	`196`	`return SUCCESS;`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`#ifdef HAVE_JIT`
`200`	`200`	`static ZEND_INI_MH(OnUpdateJit)`
`201`	`201`	`{`
`202`	`202`	`if (zend_jit_config(new_value, stage) == SUCCESS) {`
`203`		`- return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);`
	`203`	`+ return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage, modified);`
`204`	`204`	`}`
`205`	`205`	`return FAILURE;`
`206`	`206`	`}`