Skip to content

Commit bb2177e

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
2 parents 7fccdf7 + c510083 commit bb2177e

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ PHP NEWS
9292
4GB. (Girgias)
9393
. Add missing error check on tidyLoadConfig. (nielsdos)
9494

95+
- Zlib:
96+
. Fixed output_handler directive value's length which counted the string
97+
terminator. (nieldos)
98+
9599
14 Feb 2023, PHP 8.2.3
96100

97101
- Core:

ext/zlib/zlib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1279,7 +1279,7 @@ static PHP_INI_MH(OnUpdate_zlib_output_compression)
12791279
} else {
12801280
int_value = (int) zend_ini_parse_quantity_warn(new_value, entry->name);
12811281
}
1282-
ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 0);
1282+
ini_value = zend_ini_string("output_handler", sizeof("output_handler") - 1, 0);
12831283

12841284
if (ini_value && *ini_value && int_value) {
12851285
php_error_docref("ref.outcontrol", E_CORE_ERROR, "Cannot use both zlib.output_compression and output_handler together!!");

0 commit comments

Comments
 (0)