Commit 6cbd3dcff7b for php
commit 6cbd3dcff7b6ae658c514d9fc47984f357c52b5c
Merge: 90a271f0f4a 1ef29ab4be2
Author: Weilin Du <weilindu@php.net>
Date: Fri Oct 16 23:18:53 2026 +0800
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Fix GH-24350: Stale external tz database read after module restart (#24354)
diff --cc ext/date/php_date.c
index 2118aea1638,33a6c5b3ccf..f8c8bf93124
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -452,10 -454,7 +455,8 @@@ PHP_MINIT_FUNCTION(date
REGISTER_INI_ENTRIES();
date_register_classes();
register_php_date_symbols(module_number);
+ PHP_MINIT(date_time)(INIT_FUNC_ARGS_PASSTHRU);
- php_date_global_timezone_db = NULL;
- php_date_global_timezone_db_enabled = 0;
DATEG(last_errors) = NULL;
return SUCCESS;
}