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

Merge branch 'PHP-5.6' into PHP-7.0

Browse source
This commit is contained in:
Christoph M. Becker 2016-07-28 16:54:36 +02:00
commit 95190db84d
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sapi/cli/tests/cli_process_title_unix.phpt
View file

@ -15,7 +15,12 @@ $pid = getmypid();
if (cli_set_process_title($original_title) === true)
echo "Successfully set title\n";
$ps_output = shell_exec("ps -p $pid -o command | tail -n 1");
$ps_process_title_field = "command";
if (strtoupper(substr(PHP_OS, 0, 3)) == "AIX")
{
$ps_process_title_field = "args";
}
$ps_output = shell_exec("ps -p $pid -o $ps_process_title_field | tail -n 1");
if ($ps_output === null)
{