Commit d88895b103f for php.net

commit d88895b103f2548e85c8591ad8159533a553ec2a
Merge: 8f04dfd7b27 3db04878609
Author: Ilia Alshanetsky <ilia@ilia.ws>
Date:   Fri Jul 24 11:26:18 2026 -0400

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      Don't expose a freed stream resource to user filters

diff --cc NEWS
index 6445c30f1b4,0aa44c4d500..ca863b4f381
--- a/NEWS
+++ b/NEWS
@@@ -23,19 -17,13 +23,23 @@@ PH
      offset in a non-UTF-8 encoding). (Eyüp Can Akman)

  - Sockets:
 +  . Fixed socket_set_option() validation error messages for UDP_SEGMENT and
 +    SO_LINGER options. (Weilin Du)
    . Fixed various memory related issues in ext/sockets. (David Carlier)

+ - Streams:
+   . Fixed bug GH-15836 (Use-after-free when a user stream filter accesses
+     $this->stream during the close flush). (iliaal)
+
 -30 Jul 2026, PHP 8.4.24
 +30 Jul 2026, PHP 8.5.9
 +
 +- Core:
 +  . Fixed bug GH-22290 (AST pretty printing does not correctly handle strings
 +    containing NUL). (iliaal)
 +  . Fixed bug GH-22206 (missing return in global register detection).
 +    (P3p111n0)
 +  . Lock unmodified readonly properties for modification after clone-with.
 +    (NickSdot)

  - Calendar:
    . Fixed bug GH-22602 (gregoriantojd() and juliantojd() integer overflow with
diff --cc ext/standard/tests/filters/bug54350.phpt
index 046db0483a9,704ca46ab53..ec3cd857f1a
--- a/ext/standard/tests/filters/bug54350.phpt
+++ b/ext/standard/tests/filters/bug54350.phpt
@@@ -22,5 -22,5 +22,5 @@@ fwrite($fd, "foo")

  ?>
  --EXPECTF--
 -Warning: fclose(): 5 is not a valid stream resource in %s on line %d
 +Warning: fclose(): cannot close the provided stream, as it must not be manually closed in %s on line %d
- fclose(): Argument #1 ($stream) must be an open stream resource
+ fclose(): Argument #1 ($stream) must be of type resource, null given