summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2020-11-25 01:10:26 +0300
committerDmitry Stogov <dmitry@zend.com>2020-11-25 01:10:26 +0300
commit7fc2a3e15e55200883b9d96eca047ad1869b5cff (patch)
tree13fe293bfe3f073de036dcbe42129b25bb6b392f
parentcdd5ec7a3ceb8f3efc12766672c44db65205fdd1 (diff)
downloadphp-git-7fc2a3e15e55200883b9d96eca047ad1869b5cff.tar.gz
Revert "Fixed bug #80377"
This reverts commit fc26ad9b1220fdfd7db15ecaff5e7c38283c55b6.
-rw-r--r--NEWS1
-rw-r--r--ext/opcache/config.m42
-rw-r--r--ext/session/config.m42
3 files changed, 2 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 095c0efce8..1e2478cef9 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,6 @@ 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 93d72fb73d..054cd28c02 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 "$PHP_THREAD_SAFETY" = "yes"; then
+ if test "$enable_zts" = "yes"; then
DASM_FLAGS="$DASM_FLAGS -D ZTS=1"
fi
diff --git a/ext/session/config.m4 b/ext/session/config.m4
index da31bbde86..7abc8813b7 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 "$PHP_THREAD_SAFETY" = "yes"; then
+ if test "$enable_zts" = "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