Commit 29fc38b714b for php

commit 29fc38b714ba17added505cad4636b6aef27dd41
Merge: 2cf7ad09bdd 695f8264f74
Author: Levi Morrison <levi.morrison@datadoghq.com>
Date:   Fri Oct 9 09:20:25 2026 -0600

    Merge branch 'PHP-8.4' of ../PHP-8.4 into PHP-8.5

diff --cc NEWS
index ab7a4aed1ac,8dc808543b7..43e9ef3d965
--- a/NEWS
+++ b/NEWS
@@@ -1,8 -1,11 +1,11 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 8.4.28
 +?? ??? ????, PHP 8.5.13

  - Core:
+   . Fixed bug GH-24184 (System ID not being reinitialized after an Apache
+     graceful restart, potentially causing incompatible OPcache file cache
+     entries to be reused). (Levi Morrison)
    . Fixed memory leak when an exception already contains the pending exception
      in its previous chain. (Edmond)
    . Fixed bug GH-23979 (Nullsafe operator must not flush delayed oplines of an
diff --cc ext/zend_test/test.c
index 0260d25cd40,718def0b31c..ff2c4da72ac
--- a/ext/zend_test/test.c
+++ b/ext/zend_test/test.c
@@@ -39,10 -36,15 +39,11 @@@
  #include "test_arginfo.h"
  #include "zend_call_stack.h"
  #include "zend_exceptions.h"
+ #include "zend_system_id.h"
  #include "zend_mm_custom_handlers.h"
 -#include <signal.h>
 +#include "ext/uri/php_uri.h"

 -// `php.h` sets `NDEBUG` when not `PHP_DEBUG` which will make `assert()` from
 -// assert.h a no-op. In order to have `assert()` working on NDEBUG builds, we
 -// undefine `NDEBUG` and re-include assert.h
 -#undef NDEBUG
 -#include "assert.h"
 +#include <signal.h>

  #if defined(HAVE_LIBXML) && !defined(PHP_WIN32)
  # include <libxml/globals.h>