mirror of https://github.com/golang/go.git
net/http: check for nil, nil return from DialContext as well as Dial
Change-Id: I3b6dd9c40b3c10db2eda6a25b9d556c9c3733bbc
GitHub-Last-Rev: fd9b0c4193
GitHub-Pull-Request: golang/go#57448
Reviewed-on: https://go-review.googlesource.com/c/go/+/458876
Reviewed-by: Javad Rajabzadeh <ja7ad@live.com>
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
This commit is contained in:
parent
85e84a49e4
commit
eea26e8e68
|
|
@ -1180,7 +1180,11 @@ var zeroDialer net.Dialer
|
|||
|
||||
func (t *Transport) dial(ctx context.Context, network, addr string) (net.Conn, error) {
|
||||
if t.DialContext != nil {
|
||||
return t.DialContext(ctx, network, addr)
|
||||
c, err := t.DialContext(ctx, network, addr)
|
||||
if c == nil && err == nil {
|
||||
err = errors.New("net/http: Transport.DialContext hook returned (nil, nil)")
|
||||
}
|
||||
return c, err
|
||||
}
|
||||
if t.Dial != nil {
|
||||
c, err := t.Dial(network, addr)
|
||||
|
|
|
|||
Loading…
Reference in New Issue