Skip to content

Commit ab9997f

Browse files
committed
poll: fix wsapoll and poll compatibility
1 parent d4d1bc0 commit ab9997f

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

ext/standard/tests/streams/stream_poll_basic_sock_rw_close.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fwrite($socket1w, "test data");
1515
fclose($socket1r);
1616
pt_expect_events(stream_poll_wait($poll_ctx, 100), [
1717
[
18-
'events' => ['default' => STREAM_POLL_WRITE|STREAM_POLL_HUP, 'poll' => STREAM_POLL_HUP],
18+
'events' => STREAM_POLL_WRITE|STREAM_POLL_ERROR|STREAM_POLL_HUP,
1919
'data' => 'socket2_data'
2020
]
2121
], $poll_ctx);

ext/standard/tests/streams/stream_poll_basic_sock_rw_multi_level.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pt_expect_events(stream_poll_wait($poll_ctx, 100), [
4444
fclose($socket1r);
4545
pt_expect_events(stream_poll_wait($poll_ctx, 100), [
4646
[
47-
'events' => ['default' => STREAM_POLL_WRITE|STREAM_POLL_HUP, 'poll' => STREAM_POLL_HUP],
47+
'events' => STREAM_POLL_WRITE|STREAM_POLL_HUP,
4848
'data' => 'socket2_data'
4949
]
5050
], $poll_ctx);

main/poll/poll_backend_wsapoll.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,6 @@ static int wsapoll_backend_wait(
273273
/* Convert WSAPoll events to PHP poll events */
274274
uint32_t converted_events = wsapoll_events_from_native(pfd->revents);
275275

276-
/* Special check if POLLERR and POLLHUP are reported */
277-
if ((pfd->revents & POLLERR) && (pfd->revents & POLLHUP)) {
278-
/* Clear ERROR if HUP present to match other backends */
279-
converted_events &= ~PHP_POLL_ERROR;
280-
}
281-
282276
events[event_count].fd = fd;
283277
events[event_count].events = entry->events;
284278
events[event_count].revents = converted_events;

0 commit comments

Comments
 (0)