Merge branch 'PHP-7.4' into master

cmb69 · cmb69 · commit 13419befff71 · 2020-08-21T15:30:07.000+02:00
* PHP-7.4:
  Fix wrong datatype
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
@@ -315,7 +315,7 @@ ZEND_API int zend_alter_ini_entry_ex(zend_string *name, zend_string *new_value,
 {
 	zend_ini_entry *ini_entry;
 	zend_string *duplicate;
-	zend_bool modifiable;
+	uint8_t modifiable;
 	zend_bool modified;
 
 	if ((ini_entry = zend_hash_find_ptr(EG(ini_directives), name)) == NULL) {

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ ZEND_API int zend_alter_ini_entry_ex(zend_string name, zend_string new_value,`
`315`	`315`	`{`
`316`	`316`	`zend_ini_entry *ini_entry;`
`317`	`317`	`zend_string *duplicate;`
`318`		`- zend_bool modifiable;`
	`318`	`+ uint8_t modifiable;`
`319`	`319`	`zend_bool modified;`
`320`	`320`
`321`	`321`	`if ((ini_entry = zend_hash_find_ptr(EG(ini_directives), name)) == NULL) {`