Skip to content

Commit e0ab056

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix pcntl_rfork / pcntl_forkx with zend-max-execution-timers
2 parents c7c6a79 + dd1a07f commit e0ab056

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

ext/pcntl/pcntl.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,6 +1559,8 @@ PHP_FUNCTION(pcntl_rfork)
15591559
default:
15601560
php_error_docref(NULL, E_WARNING, "Error %d", errno);
15611561
}
1562+
} else if (pid == 0) {
1563+
zend_max_execution_timer_init();
15621564
}
15631565

15641566
RETURN_LONG((zend_long) pid);
@@ -1602,6 +1604,8 @@ PHP_FUNCTION(pcntl_forkx)
16021604
default:
16031605
php_error_docref(NULL, E_WARNING, "Error %d", errno);
16041606
}
1607+
} else if (pid == 0) {
1608+
zend_max_execution_timer_init();
16051609
}
16061610

16071611
RETURN_LONG((zend_long) pid);

0 commit comments

Comments
 (0)