From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 24 Nov 2020 14:52:41 +0000 (+0100)
Subject: Fixed bug #80377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc26ad9b1220fdfd7db15ecaff5e7c38283c55b6;p=php

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.
---

diff --git a/NEWS b/NEWS
index 1e2478cef9..095c0efce8 100644
--- a/NEWS
+++ b/NEWS
@@ -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