Commit 1a4a22fb1e8 for php.net
commit 1a4a22fb1e86433616c91ad78bc82df82d4e55ad
Merge: 9d5a6159e9d 79e4cd1efe9
Author: Weilin Du <weilindu@php.net>
Date: Fri Aug 28 00:52:49 2026 +0800
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix read buffer compaction in stream filter flush (#23439)
diff --cc NEWS
index 074990dc4d5,1a9f52b2ab9..7ca30795140
--- a/NEWS
+++ b/NEWS
@@@ -63,12 -61,15 +63,13 @@@ PH
- Standard:
. Fixed an out-of-bounds read when following a redirect response with an
empty Location header. (iliaal)
- . Fixed a memory leak in array_merge_recursive() when the recursive merge of
- an object converted to an array fails. (David Carlier)
+ . Fixed read buffer compaction in php_stream_filter_flush(). (crystarm)
- Zip:
+ . Fixed bug GH-17787 (ZipArchive stream stops reading early when the archive
+ is freed while the stream is still open). (Eyüp Can Akman)
. Fixed bug GH-23276 (ZipArchive subclass storing its own stream cannot be
garbage collected). (Weilin Du, ndossche)
- . Fixed ZipArchive::extractTo() and ZipArchive::getFrom*() reporting success
- on corrupted entries. (David Carlier)
- SAPI:
. Fixed fuzzer targets failing to build in isolation. (Mrmaxmeier)