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

Fix connect_timeout, check for connection readiness #127272

Closed
wants to merge 2 commits into from
Closed

Fix connect_timeout, check for connection readiness #127272

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8842a10
Fix connect timeout for non linux targets, check for readiness
Jul 3, 2024
93a968c
Merge branch 'rust-lang:master' into fix_connect_timeout
biabbas Jul 4, 2024
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
18 changes: 5 additions & 13 deletions library/std/src/sys/pal/unix/net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,19 +213,11 @@ impl Socket {
}
0 => {}
_ => {
// linux returns POLLOUT|POLLERR|POLLHUP for refused connections (!), so look
// for POLLHUP rather than read readiness
if pollfd.revents & libc::POLLHUP != 0 {
let e = self.take_error()?.unwrap_or_else(|| {
io::const_io_error!(
io::ErrorKind::Uncategorized,
"no error set after POLLHUP",
)
});
return Err(e);
}

return Ok(());
//Check if the socket connection is actually valid and did not raise any errors.
match self.take_error()?{
None => return Ok(()),
Some(e) => return Err(e)
};
}
}
}
Expand Down
Loading