Skip to content

If available override the current process with pcntl_exec #176

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
staabm wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −0
Open

If available override the current process with pcntl_exec #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 31 additions & 0 deletions src/XdebugHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,13 @@ public function check(): void
Process::setEnv($this->envAllowXdebug);
self::$inRestart = true;

// The parent was replaced by exec, so the tmp ini is ours to delete
$execIni = getenv($this->envAllowXdebug.'_EXEC_INI');
if ($execIni !== false) {
Process::setEnv($this->envAllowXdebug.'_EXEC_INI');
@unlink($execIni);
}

if (self::$xdebugVersion === null) {
// Skipped version is only set if Xdebug is not loaded
self::$skipped = $envArgs[1];
Expand Down Expand Up @@ -297,6 +304,13 @@ private function doRestart(array $command): void
$this->tryEnableSignals();
$this->notify(Status::RESTARTING, $displayCmd);

if ($this->canExec() && putenv($this->envAllowXdebug.'_EXEC_INI='.$this->tmpIni)) {
// Replaces the current process, so only returns on failure
pcntl_exec($command[0], array_slice($command, 1));
putenv($this->envAllowXdebug.'_EXEC_INI');
$this->notify(Status::ERROR, 'pcntl_exec failed, falling back to proc_open');
}

$process = proc_open($cmd, [], $pipes);
if (is_resource($process)) {
$exitCode = proc_close($process);
Expand All @@ -319,6 +333,23 @@ private function doRestart(array $command): void
exit($exitCode);
}

/**
* Returns true if the process can be replaced using pcntl_exec
*
* The persistent ini cannot be used because the tmp ini cannot be deleted
* after an exec, and blackfire does not support pcntl_exec.
*/
private function canExec(): bool
{
return PHP_VERSION_ID >= 70400
&& !$this->persistent
&& $this->tmpIni !== null
&& $this->debug !== '2'
&& function_exists('pcntl_exec')
&& getenv('BLACKFIRE_AGENT_SOCKET') === false
&& !isset($_SERVER['BLACKFIRE_AGENT_SOCKET']);
}

/**
* Returns the command line array if everything was written for the restart
*
Expand Down
Loading