Skip to content

Support executing from CGI binary and simplify child command line (ps) #21

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

Merged
clue merged 1 commit into from
May 8, 2019
Merged

Support executing from CGI binary and simplify child command line (ps) #21

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
39 changes: 33 additions & 6 deletions src/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class Factory
{
private $loop;

private $bin = PHP_BINARY;
private $useSocket;

/**
Expand All @@ -32,6 +32,18 @@ public function __construct(LoopInterface $loop)

// use socket I/O for Windows only, use faster process pipes everywhere else
$this->useSocket = DIRECTORY_SEPARATOR === '\\';

// if this is the php-cgi binary, check if we can execute the php binary instead
$candidate = \str_replace('-cgi', '', $this->bin);
if ($candidate !== $this->bin && \is_executable($candidate)) {
$this->bin = $candidate; // @codeCoverageIgnore
}

// if `php` is a symlink to the php binary, use the shorter `php` name
// this is purely cosmetic feature for the process list
if (\realpath($this->which('php')) === $this->bin) {
$this->bin = 'php'; // @codeCoverageIgnore
}
}

/**
Expand Down Expand Up @@ -78,7 +90,7 @@ public function open($filename, $flags = null)

private function openProcessIo($filename, $flags = null)
{
$command = 'exec ' . \escapeshellarg(\PHP_BINARY) . ' ' . \escapeshellarg(__DIR__ . '/../res/sqlite-worker.php');
$command = 'exec ' . \escapeshellarg($this->bin) . ' sqlite-worker.php';

// Try to get list of all open FDs (Linux/Mac and others)
$fds = @\scandir('/dev/fd');
Expand Down Expand Up @@ -120,7 +132,7 @@ private function openProcessIo($filename, $flags = null)
$command = 'exec bash -c ' . \escapeshellarg($command);
}

$process = new Process($command, null, null, $pipes);
$process = new Process($command, __DIR__ . '/../res', null, $pipes);
$process->start($this->loop);

$db = new ProcessIoDatabase($process);
Expand All @@ -139,14 +151,14 @@ private function openProcessIo($filename, $flags = null)

private function openSocketIo($filename, $flags = null)
{
$command = \escapeshellarg(\PHP_BINARY) . ' ' . \escapeshellarg(__DIR__ . '/../res/sqlite-worker.php');
$command = \escapeshellarg($this->bin) . ' sqlite-worker.php';

// launch process without default STDIO pipes
$null = \DIRECTORY_SEPARATOR === '\\' ? 'nul' : '/dev/null';
$pipes = array(
array('file', $null, 'r'),
array('file', $null, 'w'),
STDERR // array('file', $null, 'w'),
\defined('STDERR') ? \STDERR : \fopen('php://stderr', 'w')
);

// start temporary socket on random address
Expand All @@ -161,7 +173,7 @@ private function openSocketIo($filename, $flags = null)
stream_set_blocking($server, false);
$command .= ' ' . stream_socket_get_name($server, false);

$process = new Process($command, null, null, $pipes);
$process = new Process($command, __DIR__ . '/../res', null, $pipes);
$process->start($this->loop);

$deferred = new Deferred(function () use ($process, $server) {
Expand Down Expand Up @@ -214,4 +226,19 @@ private function openSocketIo($filename, $flags = null)

return $deferred->promise();
}

/**
* @param string $bin
* @return string|null
* @codeCoverageIgnore
*/
private function which($bin)
{
foreach (\explode(\PATH_SEPARATOR, \getenv('PATH')) as $path) {
if (\is_executable($path . \DIRECTORY_SEPARATOR . $bin)) {
return $path . \DIRECTORY_SEPARATOR . $bin;
}
}
return null;
}
}