Skip to content

Commit aa9b5ed

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
2 parents e3f04dd + 4199b72 commit aa9b5ed

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ PHP NEWS
2020
- FFI:
2121
. Fixed incorrect bitshifting and masking in ffi bitfield. (nielsdos)
2222

23+
- FPM:
24+
. Fixed bug GH-10315 (FPM unknown child alert not valid). (Jakub Zelenka)
25+
2326
- GMP:
2427
. Properly implement GMP::__construct(). (nielsdos)
2528

sapi/fpm/fpm/fpm_children.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,10 @@ void fpm_children_bury(void)
297297
break;
298298
}
299299
}
300+
} else if (fpm_globals.parent_pid == 1) {
301+
zlog(ZLOG_DEBUG, "unknown child (%d) exited %s - most likely an orphan process (master process is the init process)", pid, buf);
300302
} else {
301-
zlog(ZLOG_ALERT, "oops, unknown child (%d) exited %s. Please open a bug report (https://github.com/php/php-src/issues).", pid, buf);
303+
zlog(ZLOG_WARNING, "unknown child (%d) exited %s - potentially a bug or pre exec child (e.g. s6-notifyoncheck)", pid, buf);
302304
}
303305
}
304306
}

0 commit comments

Comments
 (0)