Merge branch 'PHP-8.3' into PHP-8.4

arnaud-lb · arnaud-lb · commit dd1a07f20779 · 2025-06-27T15:47:21.000+02:00
* PHP-8.3:
  Fix pcntl_rfork / pcntl_forkx with zend-max-execution-timers
diff --git a/NEWS b/NEWS
@@ -29,6 +29,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-14082 (Segmentation fault on unknown address 0x600000000018
     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:
   . Fix misleading errors in printf(). (nielsdos)
   . Fix RCN violations in array functions. (nielsdos)
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
@@ -1513,6 +1513,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);
@@ -1556,6 +1558,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);

Original file line number	Diff line number	Diff line change
`@@ -1513,6 +1513,8 @@ PHP_FUNCTION(pcntl_rfork)`
`1513`	`1513`	`default:`
`1514`	`1514`	`php_error_docref(NULL, E_WARNING, "Error %d", errno);`
`1515`	`1515`	`}`
	`1516`	`+ } else if (pid == 0) {`
	`1517`	`+ zend_max_execution_timer_init();`
`1516`	`1518`	`}`
`1517`	`1519`
`1518`	`1520`	`RETURN_LONG((zend_long) pid);`
`@@ -1556,6 +1558,8 @@ PHP_FUNCTION(pcntl_forkx)`
`1556`	`1558`	`default:`
`1557`	`1559`	`php_error_docref(NULL, E_WARNING, "Error %d", errno);`
`1558`	`1560`	`}`
	`1561`	`+ } else if (pid == 0) {`
	`1562`	`+ zend_max_execution_timer_init();`
`1559`	`1563`	`}`
`1560`	`1564`
`1561`	`1565`	`RETURN_LONG((zend_long) pid);`