D11786.diff
No OneTemporary
Actions

Size

930 B

Referenced Files

None

Subscribers

None

D11786.diff
View Options

	diff --git a/src/daemon/PhutilDaemonOverseer.php b/src/daemon/PhutilDaemonOverseer.php
	--- a/src/daemon/PhutilDaemonOverseer.php
	+++ b/src/daemon/PhutilDaemonOverseer.php
	@@ -460,12 +460,11 @@

	$processes = array_filter(explode("\n", trim($processes)));
	foreach ($processes as $process) {
	- list($pid, $command) = explode(' ', $process, 2);
	+ list($pid, $command) = preg_split('/\s+/', trim($process), 2);

	+ $pattern = '/((launch\|exec)_daemon.php\|phd-daemon)/';
	$matches = null;
	- if (!preg_match('/((launch\|exec)_daemon.php\|phd-daemon)/',
	- $command,
	- $matches)) {
	+ if (!preg_match($pattern, $command, $matches)) {
	continue;
	}

	@@ -481,7 +480,7 @@
	}

	$results[(int)$pid] = array(
	- 'type' => $type,
	+ 'type' => $type,
	'command' => $command,
	'pid' => (int) $pid,
	);