Skip to content

Fix inconsistent behavior when zend-max-execution-timers is enabled #19786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Appla wants to merge 1 commit into php:PHP-8.3 from Appla:fix_zend_max_execution_timer_v1

+6 −2

Closed

Fix inconsistent behavior when zend-max-execution-timers is enabled #19786

Changes from all commits

Commits

Show all changes

Select commit

Fix inconsistent behavior for zend_set_timeout_ex/zend_unset_timeout ...

Appla Sep 10, 2025

File filter

Filter by extension

Conversations

Jump to

Jump to file

Failed to load files.

Loading

Diff view

Diff view

8 changes: 6 additions & 2 deletions Zend/zend_execute_API.c

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -1531,7 +1531,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;
Expand Down Expand Up		@@ -1618,7 +1620,9 @@ void zend_unset_timeout(void) /* {{{ */
		tq_timer = NULL;
		}
		#elif 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;
Expand Down

Loading