Skip to content

Fix GH-25204: False EOF on an idle pipe on Windows #25206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lazerg wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+8 −1
Open

Fix GH-25204: False EOF on an idle pipe on Windows #25206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion main/streams/plain_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,12 +433,14 @@ static ssize_t php_stdiop_read(php_stream *stream, char *buf, size_t count)
HANDLE ph = (HANDLE)_get_osfhandle(data->fd);
int retry = 0;
DWORD avail_read = 0;
BOOL peeked;

do {
/* Look ahead to get the available data amount to read. Do the same
as read() does, however not blocking forever. In case it failed,
no data will be read (better than block). */
if (!PeekNamedPipe(ph, NULL, 0, NULL, &avail_read, NULL)) {
peeked = PeekNamedPipe(ph, NULL, 0, NULL, &avail_read, NULL);
if (!peeked) {
break;
}
/* If there's nothing to read, wait in 10us periods. */
Expand All @@ -447,6 +449,11 @@ static ssize_t php_stdiop_read(php_stream *stream, char *buf, size_t count)
}
} while (0 == avail_read && retry++ < 3200000);

/* The wait ran out on an open pipe, this is not the end of the stream. */
if (peeked && 0 == avail_read) {
return 0;
}

/* Reduce the required data amount to what is available, otherwise read()
will block.*/
if (avail_read < count) {
Expand Down
Loading