diff options
| author | Dmitri Shuralyov <dmitshur@golang.org> | 2023-06-15 02:08:47 -0400 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-06-15 21:14:46 +0000 |
| commit | 30b17f4f97d37f654c5090001c5b44c331b00d0c (patch) | |
| tree | 22146657d53ba1fc4206fefe2447fa05d8aebdce | |
| parent | 65db95d0ed69b047b54b2dea28406b2764a62bbe (diff) | |
| download | go-30b17f4f97d37f654c5090001c5b44c331b00d0c.tar.gz go-30b17f4f97d37f654c5090001c5b44c331b00d0c.zip | |
net/http: only disable Fetch API in tests
The Fetch API was meant to only be disabled in tests.
Since wasm_exec.js defines a global 'process' object,
it ended up being disabled anywhere that script is used.
Make the heuristic stricter so that it's less likely to
trigger anywhere but when testing js/wasm using Node.js.
For #57613.
Fixes #60808.
Change-Id: Ief8def802b466ef4faad16daccefcfd72e4398b8
Reviewed-on: https://go-review.googlesource.com/c/go/+/503675
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Damien Neil <dneil@google.com>
| -rw-r--r-- | src/net/http/roundtrip_js.go | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/net/http/roundtrip_js.go b/src/net/http/roundtrip_js.go index f4d0b9d44c..323372584f 100644 --- a/src/net/http/roundtrip_js.go +++ b/src/net/http/roundtrip_js.go @@ -11,6 +11,7 @@ import ( "fmt" "io" "strconv" + "strings" "syscall/js" ) @@ -44,11 +45,15 @@ const jsFetchRedirect = "js.fetch:redirect" // the browser globals. var jsFetchMissing = js.Global().Get("fetch").IsUndefined() -// jsFetchDisabled will be true if the "process" global is present. -// We use this as an indicator that we're running in Node.js. We -// want to disable the Fetch API in Node.js because it breaks -// our wasm tests. See https://go.dev/issue/57613 for more information. -var jsFetchDisabled = !js.Global().Get("process").IsUndefined() +// jsFetchDisabled controls whether the use of Fetch API is disabled. +// It's set to true when we detect we're running in Node.js, so that +// RoundTrip ends up talking over the same fake network the HTTP servers +// currently use in various tests and examples. See go.dev/issue/57613. +// +// TODO(go.dev/issue/60810): See if it's viable to test the Fetch API +// code path. +var jsFetchDisabled = js.Global().Get("process").Type() == js.TypeObject && + strings.HasPrefix(js.Global().Get("process").Get("argv0").String(), "node") // Determine whether the JS runtime supports streaming request bodies. // Courtesy: https://developer.chrome.com/articles/fetch-streaming-requests/#feature-detection |