Skip to content

Commit fc26ad9

Browse files
committed
Fixed bug #80377
Use $PHP_THREAD_SAFETY instead of $enable_zts to check for ZTS. This variable is also available for phpize builds, while enable_zts is only present for in-tree builds.
1 parent ae6e56f commit fc26ad9

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

NEWS

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ PHP NEWS
1616
- Opcache:
1717
. Fixed bug #80404 (Incorrect range inference result when division results
1818
in float). (Nikita)
19+
. Fixed bug #80377 (Opcache misses executor_globals). (Nikita)
1920

2021
- Standard:
2122
. Fixed bug #80366 (Return Value of zend_fstat() not Checked). (sagpant, cmb)

ext/opcache/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if test "$PHP_OPCACHE" != "no"; then
6666
esac
6767
fi
6868

69-
if test "$enable_zts" = "yes"; then
69+
if test "$PHP_THREAD_SAFETY" = "yes"; then
7070
DASM_FLAGS="$DASM_FLAGS -D ZTS=1"
7171
fi
7272

ext/session/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if test "$PHP_MM" != "no"; then
3131
AC_MSG_ERROR(cannot find mm library)
3232
fi
3333

34-
if test "$enable_zts" = "yes"; then
34+
if test "$PHP_THREAD_SAFETY" = "yes"; then
3535
dnl The mm library is not thread-safe, and mod_mm.c refuses to compile.
3636
AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts)
3737
fi

0 commit comments

Comments
 (0)