Skip to content

chore: extra pthread handling safety #2390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
henderkes wants to merge 15 commits into
base: main
Choose a base branch
from
+85 −5
Open

chore: extra pthread handling safety #2390

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1cc9346
extra pthread handling
henderkes May 4, 2026
1f2963e
fix ci
henderkes May 4, 2026
0e70661
Merge branch 'main' into feat/fork-support
henderkes May 12, 2026
c669951
Update .github/workflows/tests.yaml
henderkes May 12, 2026
3875ca2
suggestions from @dunglas
henderkes May 13, 2026
2920b0d
Merge remote-tracking branch 'origin/main' into feat/fork-support
henderkes May 13, 2026
57cdd5c
fix borked merge
henderkes May 13, 2026
91546cd
make clang format happy
henderkes May 13, 2026
197cc9b
Merge branch 'main' into feat/fork-support
henderkes May 13, 2026
4360649
Merge branch 'main' into feat/fork-support
henderkes May 27, 2026
1179026
Merge branch 'main' into feat/fork-support
henderkes Jun 3, 2026
f870e84
always include <unistd.h> on != Win32
henderkes Jun 4, 2026
e0773a0
fix grammar
henderkes Jun 4, 2026
87908bc
retry on EINTR
henderkes Jun 4, 2026
b4eb528
Merge branch 'main' into feat/fork-support
henderkes Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ jobs:
env:
phpts: ts
debug: true
- name: Install system dependencies
run: sudo apt-get update && sudo apt-get install --reinstall -y libbrotli-dev
Comment thread
henderkes marked this conversation as resolved.
Outdated
- name: Install e-dant/watcher
uses: ./.github/actions/watcher
- name: Reinstall libbrotli-dev
Expand Down
25 changes: 24 additions & 1 deletion frankenphp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,12 @@ __thread HashTable *sandboxed_env = NULL;

#ifndef PHP_WIN32
static bool is_forked_child = false;
static void frankenphp_fork_child(void) { is_forked_child = true; }
static void frankenphp_fork_child(void) {
is_forked_child = true;
#ifdef __linux__
prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0);

@henderkes henderkes May 4, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think there's an equivalent to this in macOS or BSD?

realistically speaking, it's hard to imagine this ever kicks in if a php object destructor waits on the child pid, but in case the php runtime throws an unrecoverable error in a destructor, it might exit the thread without calling the destructor responsible for signalling and cleaning up the child

@dunglas dunglas May 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that this syscall can race. Here is a workaround: https://stackoverflow.com/a/59216119

On FreeBSD, you can do this:

#include <sys/procctl.h>
#include <signal.h>

int sig = SIGKILL;
// P_PID means we are targeting a process ID. 
// 0 means "the current calling process".
procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &sig);

On macOS, it's harder; you have to run kqueue and way more code.

Comment thread
henderkes marked this conversation as resolved.
Outdated
#endif
}
#endif

/* Best-effort force-kill for stuck PHP threads.
Expand Down Expand Up @@ -916,6 +921,12 @@ static int frankenphp_startup(sapi_module_struct *sapi_module) {
static int frankenphp_deactivate(void) { return SUCCESS; }

static size_t frankenphp_ub_write(const char *str, size_t str_length) {
#ifndef PHP_WIN32
if (UNEXPECTED(is_forked_child)) {
return 0;
}
#endif

struct go_ub_write_return result =
go_ub_write(thread_index, (char *)str, str_length);

Expand All @@ -927,6 +938,12 @@ static size_t frankenphp_ub_write(const char *str, size_t str_length) {
}

static int frankenphp_send_headers(sapi_headers_struct *sapi_headers) {
#ifndef PHP_WIN32
if (UNEXPECTED(is_forked_child)) {
return SAPI_HEADER_SEND_FAILED;
}
#endif

if (SG(request_info).no_headers == 1) {
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
Expand All @@ -952,6 +969,12 @@ static int frankenphp_send_headers(sapi_headers_struct *sapi_headers) {
}

static void frankenphp_sapi_flush(void *server_context) {
#ifndef PHP_WIN32
if (UNEXPECTED(is_forked_child)) {
return;
}
#endif

sapi_send_headers();
if (go_sapi_flush(thread_index)) {
php_handle_aborted_connection();
Expand Down
Loading