Apply suggestions from code review

henderkes · AlliBalliBaba · web-flow · commit 1c49d32937b2 · 2026-04-13T01:14:35.000+07:00
certainly shouldn't cause any side effects since the only way this code path is hit is if something calls `pcntl_fork` (or an extension forks).

Co-authored-by: Alexander Stecher &lt;45872305+AlliBalliBaba@users.noreply.github.com&gt;
Signed-off-by: Marc &lt;m@pyc.ac&gt;
diff --git a/frankenphp.c b/frankenphp.c
@@ -1101,7 +1101,7 @@ static void *php_thread(void *arg) {
       /* Execute the PHP script, potential bailout to zend_catch */
       php_execute_script(&file_handle);
 #ifndef PHP_WIN32
-      if (is_forked_child) {
+      if (UNEXPECTED(is_forked_child)) {
         _exit(EG(exit_status));
       }
 #endif
@@ -1122,7 +1122,7 @@ static void *php_thread(void *arg) {
   }
   zend_catch {
 #ifndef PHP_WIN32
-    if (is_forked_child) {
+    if (UNEXPECTED(is_forked_child)) {
       _exit(EG(exit_status));
     }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1101,7 +1101,7 @@ static void php_thread(void arg) {`
`1101`	`1101`	`/* Execute the PHP script, potential bailout to zend_catch */`
`1102`	`1102`	`php_execute_script(&file_handle);`
`1103`	`1103`	`#ifndef PHP_WIN32`
`1104`		`- if (is_forked_child) {`
	`1104`	`+ if (UNEXPECTED(is_forked_child)) {`
`1105`	`1105`	`_exit(EG(exit_status));`
`1106`	`1106`	`}`
`1107`	`1107`	`#endif`
`@@ -1122,7 +1122,7 @@ static void php_thread(void arg) {`
`1122`	`1122`	`}`
`1123`	`1123`	`zend_catch {`
`1124`	`1124`	`#ifndef PHP_WIN32`
`1125`		`- if (is_forked_child) {`
	`1125`	`+ if (UNEXPECTED(is_forked_child)) {`
`1126`	`1126`	`_exit(EG(exit_status));`
`1127`	`1127`	`}`
`1128`	`1128`	`#endif`