Remove unused binary_pipes option

Option binary_pipes was added in PHP 6 which was then refactored
and this option was removed.
This commit is contained in:
Peter Kokot 2018-05-27 07:40:09 +02:00 committed by Nikita Popov
parent c70468b8d3
commit af01ef8741
7 changed files with 7 additions and 7 deletions

View File

@ -24,7 +24,7 @@ $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'))
$stdin = str_repeat('*', 1024 * 16) . '!';
$stdin = str_repeat('*', 2049 );
$options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false));
$options = array_merge(array('suppress_errors' => true, 'bypass_shell' => false));
$process = proc_open($cmd, $descriptors, $pipes, getcwd(), array(), $options);
foreach ($pipes as $pipe) {

View File

@ -11,7 +11,7 @@ if ($php === false) {
$proc = proc_open(
"$php -n",
array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
$pipes, getcwd(), array(), array('binary_pipes' => true)
$pipes, getcwd(), array(), array()
);
if ($proc === false) {
print "something went wrong.\n";

View File

@ -9,7 +9,7 @@ $pipes = array();
$proc = proc_open(
"$php -n -i"
,array(0 => array('pipe', 'r'), 1 => array('pipe', 'w'))
,$pipes, dirname(__FILE__), array(), array('binary_pipes' => true)
,$pipes, dirname(__FILE__), array(), array()
);
var_dump($proc);
if (!$proc) {

View File

@ -9,7 +9,7 @@ $descs = array(
2 => array('pipe', 'w'), // strerr
);
$other_opts = array('suppress_errors' => false, 'binary_pipes' => true);
$other_opts = array('suppress_errors' => false);
$cmd = (substr(PHP_OS, 0, 3) == 'WIN') ? 'dir' : 'ls';
$p = proc_open($cmd, $descs, $pipes, '.', NULL, $other_opts);

View File

@ -13,7 +13,7 @@ $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'))
$stdin = str_repeat('*', 1024 * 16) . '!';
$stdin = str_repeat('*', 2049 );
$options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false));
$options = array_merge(array('suppress_errors' => true, 'bypass_shell' => false));
$process = proc_open($cmd, $descriptors, $pipes, getcwd(), array(), $options);
foreach ($pipes as $pipe) {

View File

@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
$descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
$stdin = str_repeat('*', 4097);
$options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false));
$options = array_merge(array('suppress_errors' => true, 'bypass_shell' => false));
$process = proc_open($cmd, $descriptors, $pipes, getcwd(), array(), $options);
foreach ($pipes as $pipe) {

View File

@ -1120,7 +1120,7 @@ function system_with_timeout($commandline, $env = null, $stdin = null, $captureS
if ($captureStdErr) {
$descriptorspec[2] = array('pipe', 'w');
}
$proc = proc_open($commandline, $descriptorspec, $pipes, TEST_PHP_SRCDIR, $bin_env, array('suppress_errors' => true, 'binary_pipes' => true));
$proc = proc_open($commandline, $descriptorspec, $pipes, TEST_PHP_SRCDIR, $bin_env, array('suppress_errors' => true));
if (!$proc) {
return false;