mirror of
https://github.com/php/php-src.git
synced 2026-03-24 08:12:21 +01:00
Merge branch 'PHP-8.4'
* PHP-8.4: Fix pcntl_rfork / pcntl_forkx with zend-max-execution-timers
This commit is contained in:
@@ -1559,6 +1559,8 @@ PHP_FUNCTION(pcntl_rfork)
|
||||
default:
|
||||
php_error_docref(NULL, E_WARNING, "Error %d", errno);
|
||||
}
|
||||
} else if (pid == 0) {
|
||||
zend_max_execution_timer_init();
|
||||
}
|
||||
|
||||
RETURN_LONG((zend_long) pid);
|
||||
@@ -1602,6 +1604,8 @@ PHP_FUNCTION(pcntl_forkx)
|
||||
default:
|
||||
php_error_docref(NULL, E_WARNING, "Error %d", errno);
|
||||
}
|
||||
} else if (pid == 0) {
|
||||
zend_max_execution_timer_init();
|
||||
}
|
||||
|
||||
RETURN_LONG((zend_long) pid);
|
||||
|
||||
Reference in New Issue
Block a user