Commit dcd6e8006f2 for php
commit dcd6e8006f20e9ace8d8c038d40fecd9c7c95622
Merge: 430bc2d909c a0ed6cc298d
Author: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Mon Oct 5 19:45:45 2026 +0200
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Fix wordwrap() ignoring an existing break at the end of the string (#24116)
diff --cc NEWS
index fe2e4fa9028,ffaeab9dc75..f8bd540632e
--- a/NEWS
+++ b/NEWS
@@@ -142,8 -208,12 +142,10 @@@ PH
output handler. (Ilia Alshanetsky)
. Fixed proc_open() leaking descriptor zero when descriptor setup fails.
(Ilia Alshanetsky)
- . Fixed three Windows-only proc_open() defects: an uninitialized
- PROCESS_INFORMATION, an indeterminate comspec pointer after a failed
- lookup, and an unchecked CreateFileA() failure. (Ilia Alshanetsky)
- . Fix persistent stream context lifetime during shutdown (Levi Morrison)
+ . Fixed StreamPollHandle changing unread_bytes of a TLS stream when it is
+ added to an Io\Poll\Context. (Jakub Zelenka)
+ . Fix wordwrap() ignoring an existing break at the end of the string
+ (Nicolas Grekas)
- Tidy:
. Fixed a use-after-free when a tidyNode is used after its document is