Skip to content

Fix socket.getaddrinfo and upgrade socket to 3.13.11 #6564

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

Merged
youknowone merged 7 commits into from
Dec 29, 2025
Merged

Fix socket.getaddrinfo and upgrade socket to 3.13.11 #6564

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a7d417c
Fix socket.getattrinfo
youknowone Dec 28, 2025
81c1334
CAN_ attrs
youknowone Dec 28, 2025
219b4e3
DEFAULT_TIMEOUT
youknowone Dec 28, 2025
2271f74
del for socket
youknowone Dec 28, 2025
5079ee8
fix socket
youknowone Dec 29, 2025
183cebe
Upgrade socket from 3.13.11
youknowone Dec 28, 2025
ed62c8e
mark failures
youknowone Dec 29, 2025
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
Prev Previous commit
Next Next commit
DEFAULT_TIMEOUT
  • Loading branch information
@youknowone
youknowone committed Dec 29, 2025
commit 219b4e316b6aac26887cba455df1b56240b47e84
56 changes: 55 additions & 1 deletion crates/stdlib/src/socket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,10 +925,64 @@ mod _socket {
sock: Socket,
) -> io::Result<()> {
self.family.store(family);
self.kind.store(socket_kind);
// Mask out SOCK_NONBLOCK and SOCK_CLOEXEC flags from stored type
// to ensure consistent cross-platform behavior
#[cfg(any(
target_os = "android",
target_os = "dragonfly",
target_os = "freebsd",
target_os = "fuchsia",
target_os = "illumos",
target_os = "linux",
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox"
))]
let masked_kind = socket_kind & !(c::SOCK_NONBLOCK | c::SOCK_CLOEXEC);
#[cfg(not(any(
target_os = "android",
target_os = "dragonfly",
target_os = "freebsd",
target_os = "fuchsia",
target_os = "illumos",
target_os = "linux",
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox"
)))]
let masked_kind = socket_kind;
self.kind.store(masked_kind);
self.proto.store(proto);
let mut s = self.sock.write();
let sock = s.insert(sock);
// If SOCK_NONBLOCK is set, use timeout 0 (non-blocking)
#[cfg(any(
target_os = "android",
target_os = "dragonfly",
target_os = "freebsd",
target_os = "fuchsia",
target_os = "illumos",
target_os = "linux",
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox"
))]
let timeout = if socket_kind & c::SOCK_NONBLOCK != 0 {
0.0
} else {
DEFAULT_TIMEOUT.load()
};
#[cfg(not(any(
target_os = "android",
target_os = "dragonfly",
target_os = "freebsd",
target_os = "fuchsia",
target_os = "illumos",
target_os = "linux",
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox"
)))]
let timeout = DEFAULT_TIMEOUT.load();
self.timeout.store(timeout);
if timeout >= 0.0 {
Expand Down