Merge branch 'PHP-8.1' into PHP-8.2

This commit is contained in:
David Carlier 2023-03-03 12:44:33 +00:00
commit 8b70393c23
2 changed files with 4 additions and 1 deletions

3
NEWS
View File

@ -6,6 +6,9 @@ PHP NEWS
. Added optional support for max_execution_time in ZTS/Linux builds
(Kévin Dunglas)
- Opcache:
. Fixed build for macOS to cater with pkg-config settings. (David Carlier)
16 Mar 2023, PHP 8.2.4
- Core:

View File

@ -21,7 +21,7 @@
#ifdef HAVE_CAPSTONE
# define HAVE_DISASM 1
# include <capstone/capstone.h>
# include <capstone.h>
# define HAVE_CAPSTONE_ITER 1
#elif ZEND_JIT_TARGET_X86
# define HAVE_DISASM 1