archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use PDEATHSIG to kill cli-server workers if parent exists

Browse source 
Closes GH-9476
This commit is contained in:
Ilija Tovilo 2022-09-02 20:17:27 +02:00
parent c200623f28
commit ecc3fc180f
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
8 changed files with 114 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sapi/cli/php_cli_server.c
View file

@ -19,6 +19,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <assert.h>
#include <signal.h>
#ifdef PHP_WIN32
# include <process.h>
@ -49,6 +50,14 @@
#include <dlfcn.h>
#endif
#ifdef HAVE_PRCTL
# include <sys/prctl.h>
#endif
#ifdef HAVE_PROCCTL
# include <sys/procctl.h>
#endif
#include "SAPI.h"
#include "php.h"
#include "php_ini.h"
@ -2432,6 +2441,24 @@ static char *php_cli_server_parse_addr(const char *addr, int *pport) {
return pestrndup(addr, end - addr, 1);
}
#if defined(HAVE_PRCTL) || defined(HAVE_PROCCTL)
static void php_cli_server_worker_install_pdeathsig(void)
{
// Ignore failure to register PDEATHSIG, it's not available on all platforms anyway
#if defined(HAVE_PRCTL)
prctl(PR_SET_PDEATHSIG, SIGTERM);
#elif defined(HAVE_PROCCTL)
int signal = SIGTERM;
procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &signal);
#endif
// Check if parent has exited just after the fork
if (getppid() != php_cli_server_master) {
exit(1);
}
}
#endif
static void php_cli_server_startup_workers(void) {
char *workers = getenv("PHP_CLI_SERVER_WORKERS");
if (!workers) {
@ -2459,6 +2486,9 @@ static void php_cli_server_startup_workers(void) {
php_cli_server_worker + 1;
return;
} else if (pid == 0) {
#if defined(HAVE_PRCTL) || defined(HAVE_PROCCTL)
php_cli_server_worker_install_pdeathsig();
#endif
return;
} else {
php_cli_server_workers[php_cli_server_worker] = pid;