mirror of
https://github.com/golang/go
synced 2024-11-15 06:30:32 -07:00
[release-branch.go1] cmd/go: httpGet function does not use global variable httpClient
««« backport 650544a058e9 cmd/go: httpGet function does not use global variable httpClient No change, just for consistency. R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/6346048 »»»
This commit is contained in:
parent
9786db83e9
commit
731bbfef3b
@ -20,9 +20,13 @@ import (
|
||||
"net/url"
|
||||
)
|
||||
|
||||
// httpClient is the default HTTP client, but a variable so it can be
|
||||
// changed by tests, without modifying http.DefaultClient.
|
||||
var httpClient = http.DefaultClient
|
||||
|
||||
// httpGET returns the data from an HTTP GET request for the given URL.
|
||||
func httpGET(url string) ([]byte, error) {
|
||||
resp, err := http.Get(url)
|
||||
resp, err := httpClient.Get(url)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -37,10 +41,6 @@ func httpGET(url string) ([]byte, error) {
|
||||
return b, nil
|
||||
}
|
||||
|
||||
// httpClient is the default HTTP client, but a variable so it can be
|
||||
// changed by tests, without modifying http.DefaultClient.
|
||||
var httpClient = http.DefaultClient
|
||||
|
||||
// httpsOrHTTP returns the body of either the importPath's
|
||||
// https resource or, if unavailable, the http resource.
|
||||
func httpsOrHTTP(importPath string) (urlStr string, body io.ReadCloser, err error) {
|
||||
|
Loading…
Reference in New Issue
Block a user