Commit f8d0a604e9a for php
commit f8d0a604e9ac928c38cf693918efb55effe06b45
Merge: c150ed11dad c17a8bcf807
Author: Levi Morrison <levi.morrison@datadoghq.com>
Date: Mon Sep 28 07:35:35 2026 -0600
Merge remote-tracking branch 'origin/PHP-8.5' into PHP-8.6
# Conflicts:
# NEWS
diff --cc NEWS
index 8c8c92fda20,ec3e796765f..94952bf18a9
--- a/NEWS
+++ b/NEWS
@@@ -141,11 -111,7 +141,12 @@@ 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)
+ . Fixed bug GH-23780 (unserialize('') fails silently). (timwolla)
+
+- URI:
+ . Fix casing of enum cases in UriHostType and UrlHostType to match the RFC
+ and PHP’s naming policy. (timwolla)
- Zlib:
. Fixed inflate_init() dropping the preset dictionary for raw streams with
diff --cc main/php_streams.h
index 69bd996fea4,8bb1deafe53..0111a6a7841
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@@ -607,10 -626,10 +607,10 @@@ END_EXTERN_C(
/* this flag is only used by include/require functions */
#define STREAM_OPEN_FOR_ZEND_STREAM 0x00010000
-zend_result php_init_stream_wrappers(int module_number);
+void 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);