From: Mateusz Poliwczak Date: Sun, 26 Mar 2023 08:35:12 +0000 (+0000) Subject: net: support forceCgoDNS and forceGoDns on windows X-Git-Tag: go1.21rc1~1132 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1cfc87e6db5896e84472ca356e6344bc7d61a580;p=gostls13.git net: support forceCgoDNS and forceGoDns on windows Windows is able to use the go resolver now, so let the forceCgoDNS and forceGoDns work. Change-Id: Ice3d9fda9530ec88a2a22077c9a729dd940aba6d GitHub-Last-Rev: e0b6e39870b147e6a1b4db920fd39920fe9c2bfc GitHub-Pull-Request: golang/go#59250 Reviewed-on: https://go-review.googlesource.com/c/go/+/479455 Run-TryBot: Ian Lance Taylor Auto-Submit: Ian Lance Taylor TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor Reviewed-by: Damien Neil --- diff --git a/src/net/main_conf_test.go b/src/net/main_conf_test.go index 41b78eda1d..71257976bd 100644 --- a/src/net/main_conf_test.go +++ b/src/net/main_conf_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !js && !plan9 && !windows +//go:build !js && !plan9 package net diff --git a/src/net/main_noconf_test.go b/src/net/main_noconf_test.go index ab050fac2b..d7f22664b5 100644 --- a/src/net/main_noconf_test.go +++ b/src/net/main_noconf_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build (js && wasm) || plan9 || windows +//go:build (js && wasm) || plan9 package net @@ -11,7 +11,7 @@ import "runtime" // See main_conf_test.go for what these (don't) do. func forceGoDNS() func() { switch runtime.GOOS { - case "plan9", "windows": + case "plan9": return func() {} default: return nil