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
Next Next commit
Fix socket.getattrinfo
  • Loading branch information
@youknowone
youknowone committed Dec 29, 2025
commit a7d417cf634459724180bfc299e49f79aca41db0
30 changes: 24 additions & 6 deletions crates/stdlib/src/socket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1951,13 +1951,31 @@ mod _socket {
flags: opts.flags,
};

let host = opts.host.as_ref().map(|s| s.as_str());
let port = opts.port.as_ref().map(|p| -> std::borrow::Cow<'_, str> {
match p {
Either::A(s) => s.as_str().into(),
Either::B(i) => i.to_string().into(),
// Encode host using IDNA encoding
let host_encoded: Option<String> = match opts.host.as_ref() {
Some(s) => {
let encoded =
vm.state
.codec_registry
.encode_text(s.to_owned().into(), "idna", None, vm)?;
let host_str = std::str::from_utf8(encoded.as_bytes())
.map_err(|_| vm.new_runtime_error("idna output is not utf8".to_owned()))?;
Some(host_str.to_owned())
}
});
None => None,
};
let host = host_encoded.as_deref();

// Encode port using UTF-8
let port: Option<std::borrow::Cow<'_, str>> = match opts.port.as_ref() {
Some(Either::A(s)) => {
Some(std::borrow::Cow::Borrowed(s.to_str().ok_or_else(|| {
vm.new_unicode_encode_error("surrogates not allowed".to_owned())
})?))
}
Some(Either::B(i)) => Some(std::borrow::Cow::Owned(i.to_string())),
None => None,
};
let port = port.as_ref().map(|p| p.as_ref());

let addrs = dns_lookup::getaddrinfo(host, port, Some(hints))
Expand Down