1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.3'

* PHP-8.3:
  [ci skip] NEWS
  [ci skip] NEWS
  Fix timer leak (#13027)
This commit is contained in:
Arnaud Le Blanc
2024-01-05 19:47:58 +01:00

View File

@@ -35,6 +35,12 @@
ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
{
pid_t pid = getpid();
if (EG(pid) == pid) {
return;
}
struct sigevent sev;
sev.sigev_notify = SIGEV_THREAD_ID;
sev.sigev_value.sival_ptr = &EG(max_execution_timer_timer);
@@ -48,9 +54,9 @@ ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
EG(pid) = getpid();
# ifdef MAX_EXECUTION_TIMERS_DEBUG
# ifdef MAX_EXECUTION_TIMERS_DEBUG
fprintf(stderr, "Timer %#jx created on thread %d\n", (uintmax_t) EG(max_execution_timer_timer), sev.sigev_notify_thread_id);
# endif
# endif
sigaction(sev.sigev_signo, NULL, &EG(oldact));
}