mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #64770 stream_select() fails with pipes

Browse Source 
returned by proc_open() on Windows x64
This commit is contained in:
Anatol Belski 2013-05-03 17:01:33 +02:00
parent aa448adc83
commit b1ea0b7a7a
3 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -11,6 +11,10 @@ PHP NEWS
. Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB . Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB
pointer has closed). (Laruence) pointer has closed). (Laruence)
- Streams:
. Fixed bug #64770 (stream_select() fails with pipes returned by proc_open()
on Windows x64). (Anatol)
?? ??? 2013, PHP 5.3.25 ?? ??? 2013, PHP 5.3.25
### ADD ENTRIES ABOVE FOR 5.3.26. 5.3.25 NEWS WILL BE UPDATED BY RM ON MERGE ### ### ADD ENTRIES ABOVE FOR 5.3.26. 5.3.25 NEWS WILL BE UPDATED BY RM ON MERGE ###

4
ext/standard/streamsfuncs.c
View File

@ -611,7 +611,7 @@ static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, php_socket_t
{ {
zval **elem; zval **elem;
php_stream *stream; php_stream *stream;
php_socket_t this_fd; php_socket_t this_fd = 0;
int cnt = 0; int cnt = 0;
if (Z_TYPE_P(stream_array) != IS_ARRAY) { if (Z_TYPE_P(stream_array) != IS_ARRAY) {
@ -648,7 +648,7 @@ static int stream_array_from_fd_set(zval *stream_array, fd_set *fds TSRMLS_DC)
zval **elem, **dest_elem; zval **elem, **dest_elem;
php_stream *stream; php_stream *stream;
HashTable *new_hash; HashTable *new_hash;
php_socket_t this_fd; php_socket_t this_fd = 0;
int ret = 0; int ret = 0;
if (Z_TYPE_P(stream_array) != IS_ARRAY) { if (Z_TYPE_P(stream_array) != IS_ARRAY) {

51
ext/standard/tests/streams/bug64770.phpt Normal file
View File

@ -0,0 +1,51 @@
--TEST--
Bug #64770 stream_select() fails with pipes from proc_open()
--FILE--
<?php
$descs = array(
0 => array('pipe', 'r'), // stdin
1 => array('pipe', 'w'), // stdout
2 => array('pipe', 'w'), // strerr
);
$other_opts = array('suppress_errors' => false, 'binary_pipes' => true);
$p = proc_open('dir', $descs, $pipes, '.', NULL, $other_opts);
if (is_resource($p)) {
$data = '';
while (1) {
$w = $e = NULL;
$n = stream_select($pipes, $w, $e, 300);
if ($n === false) {
echo "no streams \n";
break;
} else if ($n === 0) {
echo "process timed out\n";
proc_terminate($p, 9);
break;
} else if ($n > 0) {
$line = fread($pipes[1], 8192);
if (strlen($line) == 0) {
/* EOF */
break;
}
$data .= $line;
}
}
var_dump(strlen($data));
$ret = proc_close($p);
var_dump($ret);
} else {
echo "no process\n";
}
?>
==DONE==
--EXPECTF--
int(%d)
int(0)
==DONE==