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 pcntl_rfork / pcntl_forkx with zend-max-execution-timers
This commit is contained in:
Arnaud Le Blanc
2025-06-27 15:46:54 +02:00
parent 86e5c67d6c aee1d7fb96
commit dd1a07f207
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -29,6 +29,10 @@ PHP NEWS
. Fixed bug GH-14082 (Segmentation fault on unknown address 0x600000000018 . Fixed bug GH-14082 (Segmentation fault on unknown address 0x600000000018
in ext/opcache/jit/zend_jit.c). (nielsdos) in ext/opcache/jit/zend_jit.c). (nielsdos)
- PCNTL:
. Fixed bug GH-18958 (Fatal error during shutdown after pcntl_rfork() or
pcntl_forkx() with zend-max-execution-timers). (Arnaud)
- Standard: - Standard:
. Fix misleading errors in printf(). (nielsdos) . Fix misleading errors in printf(). (nielsdos)
. Fix RCN violations in array functions. (nielsdos) . Fix RCN violations in array functions. (nielsdos)

4
ext/pcntl/pcntl.c
View File

@@ -1513,6 +1513,8 @@ PHP_FUNCTION(pcntl_rfork)
default: default:
php_error_docref(NULL, E_WARNING, "Error %d", errno); php_error_docref(NULL, E_WARNING, "Error %d", errno);
} }
} else if (pid == 0) {
zend_max_execution_timer_init();
} }
RETURN_LONG((zend_long) pid); RETURN_LONG((zend_long) pid);
@@ -1556,6 +1558,8 @@ PHP_FUNCTION(pcntl_forkx)
default: default:
php_error_docref(NULL, E_WARNING, "Error %d", errno); php_error_docref(NULL, E_WARNING, "Error %d", errno);
} }
} else if (pid == 0) {
zend_max_execution_timer_init();
} }
RETURN_LONG((zend_long) pid); RETURN_LONG((zend_long) pid);