mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Merge branch 'pull-request/1588' into PHP-7.0
* pull-request/1588: Fixed #69442 closing of fd incorrect when PTS enabled
This commit is contained in:
commit
ff6b309c6f
3
NEWS
3
NEWS
@ -11,6 +11,9 @@ PHP NEWS
|
||||
- Session:
|
||||
. Fixed bug #69582 (session not readable by root in CLI). (EvgeniySpinov)
|
||||
|
||||
- Standard:
|
||||
. Fixed bug #69442 (closing of fd incorrect when PTS enabled). (jaytaph)
|
||||
|
||||
19 Jan 2017 PHP 7.0.15
|
||||
|
||||
- Core:
|
||||
|
@ -820,6 +820,12 @@ PHP_FUNCTION(proc_open)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if PHP_CAN_DO_PTS
|
||||
if (dev_ptmx >= 0) {
|
||||
close(dev_ptmx);
|
||||
close(slave_pty);
|
||||
}
|
||||
#endif
|
||||
/* close those descriptors that we just opened for the parent stuff,
|
||||
* dup new descriptors into required descriptors and close the original
|
||||
* cruft */
|
||||
@ -835,13 +841,6 @@ PHP_FUNCTION(proc_open)
|
||||
close(descriptors[i].childend);
|
||||
}
|
||||
|
||||
#if PHP_CAN_DO_PTS
|
||||
if (dev_ptmx >= 0) {
|
||||
close(dev_ptmx);
|
||||
close(slave_pty);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (cwd) {
|
||||
php_ignore_value(chdir(cwd));
|
||||
}
|
||||
|
46
ext/standard/tests/file/bug69442.phpt
Normal file
46
ext/standard/tests/file/bug69442.phpt
Normal file
@ -0,0 +1,46 @@
|
||||
--TEST--
|
||||
proc_open with PTY closes incorrect file descriptor
|
||||
--SKIPIF--
|
||||
<?php
|
||||
|
||||
$code = <<< 'EOC'
|
||||
<?php
|
||||
$descriptors = array(array("pty"), array("pty"), array("pty"), array("pipe", "w"));
|
||||
$pipes = array();
|
||||
$process = proc_open('echo "foo";', $descriptors, $pipes);
|
||||
EOC;
|
||||
|
||||
$tmpFile = tempnam(sys_get_temp_dir(), "bug69442");
|
||||
file_put_contents($tmpFile, $code);
|
||||
|
||||
exec($_SERVER['TEST_PHP_EXECUTABLE']." ".$tmpFile." 2>&1", $output);
|
||||
$output = join("\n", $output);
|
||||
unlink($tmpFile);
|
||||
|
||||
if (strstr($output, "pty pseudo terminal not supported on this system") !== false) {
|
||||
die("skip PTY pseudo terminals are not supported");
|
||||
}
|
||||
--FILE--
|
||||
<?php
|
||||
$cmd = '(echo "foo" ; exit 42;) 3>/dev/null; code=$?; echo $code >&3; exit $code';
|
||||
$descriptors = array(array("pty"), array("pty"), array("pty"), array("pipe", "w"));
|
||||
$pipes = array();
|
||||
|
||||
$process = proc_open($cmd, $descriptors, $pipes);
|
||||
|
||||
foreach ($pipes as $type => $pipe) {
|
||||
$data = fread($pipe, 999);
|
||||
echo 'type ' . $type . ' ';
|
||||
var_dump($data);
|
||||
fclose($pipe);
|
||||
}
|
||||
proc_close($process);
|
||||
--EXPECT--
|
||||
type 0 string(5) "foo
|
||||
"
|
||||
type 1 string(0) ""
|
||||
type 2 string(0) ""
|
||||
type 3 string(3) "42
|
||||
"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user