From 7988f79528e2105a83bc00b91866b639b181dd51 Mon Sep 17 00:00:00 2001 From: Ryan Liptak Date: Wed, 19 Aug 2026 23:27:14 -0700 Subject: [PATCH] Io.Threaded.netLookupFallible: map TIMEOUT to error.NameServerFailure on Windows This matches the error used in lookupDns when ResolvConf.timeout_seconds has elapsed as well as what EAI_AGAIN gets mapped to when using getaddrinfo --- lib/std/Io/Threaded.zig | 2 +- lib/std/Io/net/HostName.zig | 1 - lib/std/Io/net/test.zig | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/std/Io/Threaded.zig b/lib/std/Io/Threaded.zig index f6f6f149ea477813ab49e4e4762336c0c37322ca..b737fa5e0993d9dbe4e0e0a4f20fdd2ddd5112f8 100644 --- a/lib/std/Io/Threaded.zig +++ b/lib/std/Io/Threaded.zig @@ -13982,7 +13982,7 @@ fn netLookupFallible( .DNS_ERROR_INVALID_NAME_CHAR, .DNS_ERROR_RECORD_DOES_NOT_EXIST, => return error.UnknownHostName, - .TIMEOUT => return error.Timeout, + .TIMEOUT => return error.NameServerFailure, else => |err| return windows.unexpectedError(err), } } diff --git a/lib/std/Io/net/HostName.zig b/lib/std/Io/net/HostName.zig index dbcc1df04669dd45452d4cf267ef81bfdf856825..8c5717d56d13f7dc5bc861cdfbda7cbb81816860 100644 --- a/lib/std/Io/net/HostName.zig +++ b/lib/std/Io/net/HostName.zig @@ -156,7 +156,6 @@ pub const LookupError = error{ NoAddressReturned, /// Failed to open or read "/etc/hosts" or "/etc/resolv.conf". DetectingNetworkConfigurationFailed, - Timeout, } || IpAddress.BindError || Io.Cancelable; pub const LookupResult = union(enum) { diff --git a/lib/std/Io/net/test.zig b/lib/std/Io/net/test.zig index 3e065afa3a506810e02e7493eba4a5a2c87b1f95..038269b30b3d7dcf927038bd6719357569eddd53 100644 --- a/lib/std/Io/net/test.zig +++ b/lib/std/Io/net/test.zig @@ -173,7 +173,6 @@ test "resolve DNS" { }) catch |err| switch (err) { error.UnknownHostName => return error.SkipZigTest, error.NameServerFailure => return error.SkipZigTest, - error.Timeout => return error.SkipZigTest, else => |e| return e, }; -- 2.54.0