1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

GH-16889: stream_select() timeout useless for pipes on Windows

Pipes are blocking on Windows, but `php_select()` always returns them
as ready for read/write.  This renders the `stream_select()` timeout
useless, what can cause a following read to block for a very long time.

While there is no general fix (and least not within reach for a stable
version), we can at least cater to the important case of read pipes by
peeking the pipe to check whether data is available.  If there is none,
we do not add the handle to the read set.

We need to fix a couple of tests cases:

* bug60692.phpt and bug64770.phpt assume that at least the stdin and
  stdout pipes are always selected as readable, and that the select
  call will not change their order.  We're being more defensive now.
* the potentials warnings of bug49936_win32.phpt need to be suppressed,
  like it has been done earlier for the POSIX variant of this test
  case[1].  Possibly this test case should be dropped altogether[2].

[1] <c884d3782c>
[2] <2c6b85f6fe>

Closes GH-16917.
This commit is contained in:
Christoph M. Becker
2024-11-24 19:06:01 +01:00
parent d98e1918cb
commit b614b4a69a
6 changed files with 49 additions and 16 deletions

4
NEWS
View File

@@ -74,6 +74,10 @@ PHP NEWS
. Fixed crypt() tests on musl when using --with-external-libcrypt
(Michael Orlitzky).
- Streams:
. Fixed bug GH-16889 (stream_select() timeout useless for pipes on Windows).
(cmb)
- Windows:
. Fixed bug GH-10992 (Improper long path support for relative paths). (cmb,
nielsdos)

View File

@@ -12,17 +12,10 @@ default_socket_timeout=2
$dir = 'ftp://your:self@localhost/';
var_dump(opendir($dir));
var_dump(opendir($dir));
var_dump(@opendir($dir));
var_dump(@opendir($dir));
?>
--EXPECTF--
Warning: opendir(): connect() failed: %s in %s on line %d
Warning: opendir(ftp://...@localhost/): Failed to open directory: operation failed in %s on line %d
bool(false)
Warning: opendir(): connect() failed: %s in %s on line %d
Warning: opendir(ftp://...@localhost/): Failed to open directory: operation failed in %s on line %d
bool(false)

View File

@@ -18,8 +18,9 @@ if (is_resource($p)) {
$data = '';
while (1) {
$r = [$pipes[1]];
$w = $e = NULL;
$n = stream_select($pipes, $w, $e, 300);
$n = stream_select($r, $w, $e, 300);
if ($n === false) {
echo "no streams \n";
@@ -29,7 +30,7 @@ if (is_resource($p)) {
proc_terminate($p, 9);
break;
} else if ($n > 0) {
$line = fread($pipes[1], 8192);
$line = fread($r[0], 8192);
if (strlen($line) == 0) {
/* EOF */
break;

View File

@@ -18,8 +18,9 @@ if (is_resource($p)) {
$data = '';
while (1) {
$r = [$pipes[1]];
$w = $e = NULL;
$n = stream_select($pipes, $w, $e, 300);
$n = stream_select($r, $w, $e, 300);
if ($n === false) {
echo "no streams \n";
@@ -29,7 +30,7 @@ if (is_resource($p)) {
proc_terminate($p, 9);
break;
} else if ($n > 0) {
$line = fread($pipes[1], 8192);
$line = fread($r[0], 8192);
if (strlen($line) == 0) {
/* EOF */
break;

View File

@@ -0,0 +1,26 @@
--TEST--
GH-16889 (stream_select() timeout useless for pipes on Windows)
--FILE--
<?php
$desc = [
["pipe", "r"],
["pipe", "w"],
["pipe", "w"],
];
// open process which won't produce output for 10s
$proc = proc_open([PHP_BINARY, "-r", "sleep(10); echo 'finish';"], $desc, $pipes);
$read = [$pipes[1]];
$write = null;
$except = null;
$time0 = microtime(true);
// select STDOUT pipe of process for 1ms
if (stream_select($read, $write, $except, 0, 1000)) {
var_dump(fread($read[0], 1));
}
// avoid blocking of finishing the test process
proc_terminate($proc);
$time1 = microtime(true);
var_dump($time1 - $time0 < 1);
?>
--EXPECT--
bool(true)

View File

@@ -21,7 +21,7 @@
* - If you supply only sockets, this simply passes through to winsock select().
* - If you supply file handles, there is no way to distinguish between
* ready for read/write or OOB, so any set in which the handle is found will
* be marked as ready.
* be marked as ready. Pipes will be checked if they are ready for read, though.
* - If you supply a mixture of handles and sockets, the system will interleave
* calls between select() and WaitForMultipleObjects(). The time slicing may
* cause this function call to take up to 100 ms longer than you specified.
@@ -135,15 +135,23 @@ PHPAPI int php_select(php_socket_t max_fd, fd_set *rfds, fd_set *wfds, fd_set *e
for (i = 0; i < n_handles; i++) {
if (WAIT_OBJECT_0 == WaitForSingleObject(handles[i], 0)) {
if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) {
FD_SET((uint32_t)handle_slot_to_fd[i], &aread);
DWORD avail_read = 0;
if (GetFileType(handles[i]) != FILE_TYPE_PIPE
|| !PeekNamedPipe(handles[i], NULL, 0, NULL, &avail_read, NULL)
|| avail_read > 0
) {
FD_SET((uint32_t)handle_slot_to_fd[i], &aread);
retcode++;
}
}
if (SAFE_FD_ISSET(handle_slot_to_fd[i], wfds)) {
FD_SET((uint32_t)handle_slot_to_fd[i], &awrite);
retcode++;
}
if (SAFE_FD_ISSET(handle_slot_to_fd[i], efds)) {
FD_SET((uint32_t)handle_slot_to_fd[i], &aexcept);
retcode++;
}
retcode++;
}
}
}