Skip to content
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

Jump to bottom

multi_wait: fix skipping to populate revents for extra_fds #9361

Closed
wants to merge 1 commit into from
Closed

multi_wait: fix skipping to populate revents for extra_fds #9361

wants to merge 1 commit into from

Conversation

mback2k
Copy link
Member

@mback2k mback2k commented Aug 24, 2022

Splitting from #9203 to merge before the pending release:

On Windows revents was not populated for extra_fds if
multi_wait had to wait due to the Curl_poll pre-check
not signalling any readyness. This commit fixes that.

@mback2k mback2k added the Windows Windows-specific label Aug 24, 2022
@mback2k mback2k requested review from bagder and jay August 24, 2022 22:02
@mback2k mback2k self-assigned this Aug 24, 2022
@mback2k
Copy link
Member Author

mback2k commented Aug 25, 2022

Waiting for #9364 to be merged to re-run tests.

MarcelRaad
MarcelRaad approved these changes Aug 25, 2022
View reviewed changes
lib/multi.c Show resolved Hide resolved
@mback2k
multi_wait: fix skipping to populate revents for extra_fds
cfd2449 
On Windows revents was not populated for extra_fds if
multi_wait had to wait due to the Curl_poll pre-check
not signalling any readyness. This commit fixes that.

Reviewed-by: Marcel Raad
Reviewed-by: Jay Satiro

Closes curl#9361
@mback2k
Copy link
Member Author

mback2k commented Aug 25, 2022

Just checked: failed CIs are irrelevant for this change. So going to merge this.

@mback2k mback2k closed this in a71fe41 Aug 25, 2022
mback2k added a commit to mback2k/curl that referenced this pull request Aug 25, 2022
@mback2k
multi_wait: fix and improve Curl_poll error handling on Windows
4ce56f0 
First check for errors and return CURLM_UNRECOVERABLE_POLL
before moving forward and waiting on socket readiness events.

Reported-by: Daniel Stenberg
Ref: curl#9361

Follow up to curl#8961
@mback2k mback2k mentioned this pull request Aug 25, 2022
Closed
mback2k added a commit to mback2k/curl that referenced this pull request Aug 26, 2022
@mback2k
multi_wait: fix and improve Curl_poll error handling on Windows
bc25c9e 
First check for errors and return CURLM_UNRECOVERABLE_POLL
before moving forward and waiting on socket readiness events.

Reviewed-by: Jay Satiro
Reviewed-by: Marcel Raad

Reported-by: Daniel Stenberg
Ref: curl#9361

Follow up to curl#8961
Closes curl#9372
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jay jay jay approved these changes

@MarcelRaad MarcelRaad MarcelRaad approved these changes

@bagder bagder Awaiting requested review from bagder

Assignees

@mback2k mback2k

Labels
Windows Windows-specific
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mback2k @bagder @jay @MarcelRaad