Commit c17a8bcf807 for php
commit c17a8bcf80740cbca111cb5908432ebed6e9ba31
Merge: b7b493bf6f8 ee3035bc660
Author: Levi Morrison <levi.morrison@datadoghq.com>
Date: Mon Sep 28 07:32:18 2026 -0600
Merge remote-tracking branch 'origin/PHP-8.4' into PHP-8.5
diff --cc NEWS
index b9841c6de9e,4dedb89b0d3..ec3e796765f
--- a/NEWS
+++ b/NEWS
@@@ -111,13 -115,20 +111,14 @@@ PH
. 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)
-- XSL:
- . Fixed bug GH-23730 (use-after-free when XSLTProcessor::importStylesheet()
- is called during a transformation). (David Carlier)
-
-- Zip:
- . Fixed ZipArchive::extractTo() ignoring files given in a non-list array.
- (David Carlier)
- . Fixed bug GH-23747 (ZipArchive::close() use-after-free from a progress or
- cancel callback). (David Carlier)
+- Zlib:
+ . Fixed inflate_init() dropping the preset dictionary for raw streams with
+ a non-default window. (Ilia Alshanetsky)
-24 Sep 2026, PHP 8.4.26
+24 Sep 2026, PHP 8.5.11
- BCMath:
. Fixed out-of-bounds read in bc_is_zero_for_scale() when scale exceeds
diff --cc main/php_streams.h
index 1c52539cfca,fc1585ed713..8bb1deafe53
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@@ -626,10 -583,10 +626,10 @@@ END_EXTERN_C(
/* this flag is only used by include/require functions */
#define STREAM_OPEN_FOR_ZEND_STREAM 0x00010000
-int php_init_stream_wrappers(int module_number);
+zend_result php_init_stream_wrappers(int module_number);
void php_shutdown_stream_wrappers(int module_number);
void php_shutdown_stream_hashes(void);
- PHP_RSHUTDOWN_FUNCTION(streams);
+ ZEND_MODULE_POST_ZEND_DEACTIVATE_D(streams);
BEGIN_EXTERN_C()
PHPAPI zend_result php_register_url_stream_wrapper(const char *protocol, const php_stream_wrapper *wrapper);