Skip to content

Commit 32d982e

Browse files
committed
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5: Fix GH-25195: smm_shared_globals left dangling without an SHM backend
2 parents 60959f1 + f854ff9 commit 32d982e

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

‎NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ PHP NEWS
3535
(waroad)
3636
. Fixed bug GH-25037 (Function JIT ENTRY live var assertion).
3737
(Ilia Alshanetsky)
38+
. Fixed bug GH-25195 (smm_shared_globals left dangling without an
39+
SHM backend). (Lazizbek Ergashev)
3840

3941
- OpenSSL:
4042
. Fixed bug GH-25172 (TLS session reuse shares request-lifetime callback

‎ext/opcache/zend_shared_alloc.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)
238238
if (!g_shared_alloc_handler) {
239239
/* try memory handlers in order */
240240
if (handler_table->name == NULL) {
241+
smm_shared_globals = NULL;
241242
return NO_SHM_BACKEND;
242243
}
243244
for (he = handler_table; he->name; he++) {

0 commit comments

Comments
 (0)