diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-24 15:52:41 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-24 15:52:41 +0100 |
| commit | fc26ad9b1220fdfd7db15ecaff5e7c38283c55b6 (patch) | |
| tree | 27e58c5b8b1677b84ad1f3a0b99da012857d27c7 | |
| parent | ae6e56fb98aec9a874298938fdb41e74898b6084 (diff) | |
| download | php-git-fc26ad9b1220fdfd7db15ecaff5e7c38283c55b6.tar.gz | |
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.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/opcache/config.m4 | 2 | ||||
| -rw-r--r-- | ext/session/config.m4 | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -16,6 +16,7 @@ PHP NEWS - Opcache: . Fixed bug #80404 (Incorrect range inference result when division results in float). (Nikita) + . Fixed bug #80377 (Opcache misses executor_globals). (Nikita) - Standard: . Fixed bug #80366 (Return Value of zend_fstat() not Checked). (sagpant, cmb) diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index 054cd28c02..93d72fb73d 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 @@ -66,7 +66,7 @@ if test "$PHP_OPCACHE" != "no"; then esac fi - if test "$enable_zts" = "yes"; then + if test "$PHP_THREAD_SAFETY" = "yes"; then DASM_FLAGS="$DASM_FLAGS -D ZTS=1" fi diff --git a/ext/session/config.m4 b/ext/session/config.m4 index 7abc8813b7..da31bbde86 100644 --- a/ext/session/config.m4 +++ b/ext/session/config.m4 @@ -31,7 +31,7 @@ if test "$PHP_MM" != "no"; then AC_MSG_ERROR(cannot find mm library) fi - if test "$enable_zts" = "yes"; then + if test "$PHP_THREAD_SAFETY" = "yes"; then dnl The mm library is not thread-safe, and mod_mm.c refuses to compile. AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts) fi |