Commit 45d6daa71c9 for php.net
commit 45d6daa71c9700bda0edc51aed66b407050a08bc
Merge: c633ce884b7 7782b8876bc
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date: Fri Apr 3 18:21:53 2026 +0200
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix NULL deref when enabling TLS fails and the peer name needs to be reset
diff --cc NEWS
index d955dd07043,1e72166bf93..eb098f11c04
--- a/NEWS
+++ b/NEWS
@@@ -27,11 -24,16 +27,15 @@@ PH
. Fixed bug GH-21499 (RecursiveArrayIterator getChildren UAF after parent
free). (Girgias)
+ - Streams:
+ . Fixed bug GH-21468 (Segfault in file_get_contents w/ a https URL
+ and a proxy set). (ndossche)
+
-09 Apr 2026, PHP 8.4.20
-
-- Bz2:
- . Fix truncation of total output size causing erroneous errors. (ndossche)
+26 Mar 2026, PHP 8.5.5
- Core:
+ . Fixed bug GH-20672 (Incorrect property_info sizing for locally shadowed
+ trait properties). (ilutov)
. Fixed bugs GH-20875, GH-20873, GH-20854 (Propagate IN_GET guard in
get_property_ptr_ptr for lazy proxies). (iliaal)