Merge branch 'PHP-8.2'

devnexen · devnexen · commit 1c62c60c9432 · 2023-02-23T18:49:19.000Z
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
@@ -1277,7 +1277,7 @@ static PHP_INI_MH(OnUpdate_zlib_output_compression)
 	} else {
 		int_value = (int) zend_ini_parse_quantity_warn(new_value, entry->name);
 	}
-	ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 0);
+	ini_value = zend_ini_string("output_handler", sizeof("output_handler") - 1, 0);
 
 	if (ini_value && *ini_value && int_value) {
 		php_error_docref("ref.outcontrol", E_CORE_ERROR, "Cannot use both zlib.output_compression and output_handler together!!");

Original file line number	Diff line number	Diff line change
`@@ -1277,7 +1277,7 @@ static PHP_INI_MH(OnUpdate_zlib_output_compression)`
`1277`	`1277`	`} else {`
`1278`	`1278`	`int_value = (int) zend_ini_parse_quantity_warn(new_value, entry->name);`
`1279`	`1279`	`}`
`1280`		`- ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 0);`
	`1280`	`+ ini_value = zend_ini_string("output_handler", sizeof("output_handler") - 1, 0);`
`1281`	`1281`
`1282`	`1282`	`if (ini_value && *ini_value && int_value) {`
`1283`	`1283`	`php_error_docref("ref.outcontrol", E_CORE_ERROR, "Cannot use both zlib.output_compression and output_handler together!!");`