aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/net/http/roundtrip_js.go16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/net/http/roundtrip_js.go b/src/net/http/roundtrip_js.go
index e60b7368df..277fc7ed3b 100644
--- a/src/net/http/roundtrip_js.go
+++ b/src/net/http/roundtrip_js.go
@@ -11,14 +11,15 @@ import (
"fmt"
"io"
"io/ioutil"
- "net"
+ "os"
+ "path"
"strconv"
"syscall/js"
)
// RoundTrip implements the RoundTripper interface using the WHATWG Fetch API.
func (*Transport) RoundTrip(req *Request) (*Response, error) {
- if useFakeNetwork(req) {
+ if useFakeNetwork() {
return t.roundTrip(req)
}
headers := js.Global.Get("Headers").New()
@@ -135,15 +136,8 @@ func (*Transport) RoundTrip(req *Request) (*Response, error) {
// useFakeNetwork is used to determine whether the request is made
// by a test and should be made to use the fake in-memory network.
-func useFakeNetwork(req *Request) bool {
- host, _, err := net.SplitHostPort(req.Host)
- if err != nil {
- host = req.Host
- }
- if ip := net.ParseIP(host); ip != nil {
- return ip.IsLoopback(ip)
- }
- return host == "localhost"
+func useFakeNetwork() bool {
+ return len(os.Args) > 0 && path.Base(os.Args[0]) == "node"
}
// streamReader implements an io.ReadCloser wrapper for ReadableStream.