php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix hard_timeout when zend-max-execution-timers is enabled
This commit is contained in:
Ilija Tovilo
2025-09-11 14:50:57 +02:00
parent 4e0e88a140 ed9430a5d1
commit c733491e4b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -5,6 +5,7 @@ PHP NEWS
- Core:
. Fixed bug GH-19765 (object_properties_load() bypasses readonly property
checks). (timwolla)
. Fixed hard_timeout with --enable-zend-max-execution-timers. (Appla)
- Opcache:
. Fixed bug GH-19669 (assertion failure in zend_jit_trace_type_to_info_ex).

8
Zend/zend_execute_API.c
View File

@@ -1570,7 +1570,9 @@ static void zend_set_timeout_ex(zend_long seconds, bool reset_signals) /* {{{ */
return;
}
#elif defined(ZEND_MAX_EXECUTION_TIMERS)
zend_max_execution_timer_settime(seconds);
if (seconds > 0) {
zend_max_execution_timer_settime(seconds);
}
if (reset_signals) {
sigset_t sigset;
@@ -1657,7 +1659,9 @@ void zend_unset_timeout(void) /* {{{ */
tq_timer = NULL;
}
#elif defined(ZEND_MAX_EXECUTION_TIMERS)
zend_max_execution_timer_settime(0);
if (EG(timeout_seconds)) {
zend_max_execution_timer_settime(0);
}
#elif defined(HAVE_SETITIMER)
if (EG(timeout_seconds)) {
struct itimerval no_timeout;