diff --git a/.github/lsan-suppressions.txt b/.github/lsan-suppressions.txt index 5c2ee76e4607a..3ce5de80bd6a7 100644 --- a/.github/lsan-suppressions.txt +++ b/.github/lsan-suppressions.txt @@ -1 +1,2 @@ leak:acommon::DictInfoList::elements +leak:timer_create diff --git a/NEWS b/NEWS index a988b783f6ee2..0dd7030a1a1e9 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,8 @@ PHP NEWS . Fix bug GH-8821 (Improve line numbers for errors in constant expressions). (ilutov) . Fix bug GH-10083 (Allow comments between & and parameter). (ilutov) + . Zend Max Execution Timers is now enabled by default for ZTS builds on + Linux. (Kévin Dunglas) - Date: . Implement More Appropriate Date/Time Exceptions RFC. (Derick) diff --git a/UPGRADING b/UPGRADING index cdada9e9b3273..699f69b1b6da1 100644 --- a/UPGRADING +++ b/UPGRADING @@ -33,6 +33,8 @@ PHP 8.3 UPGRADE NOTES Internally, this works by caching the result on posix systems. If you want the old behaviour, you can check the "cached" key in the array returned by proc_get_status() to check whether the result was cached. + . Zend Max Execution Timers is now enabled by default for ZTS builds on + Linux. - FFI: . C functions that have a return type of void now return null instead of diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index a1450e4f13396..d8f789f9647a4 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -307,7 +307,7 @@ AC_ARG_ENABLE([zend-max-execution-timers], [AS_HELP_STRING([--enable-zend-max-execution-timers], [whether to enable zend max execution timers])], [ZEND_MAX_EXECUTION_TIMERS=$enableval], - [ZEND_MAX_EXECUTION_TIMERS='no']) + [ZEND_MAX_EXECUTION_TIMERS=$ZEND_ZTS]) AS_CASE(["$host_alias"], [*linux*], [], [ZEND_MAX_EXECUTION_TIMERS='no'])