mirror of https://github.com/golang/go.git
Merge 1be6efdadf into 49cdf0c42e
This commit is contained in:
commit
ec0eb6d958
|
|
@ -557,7 +557,14 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (Conn
|
|||
resolveCtx = context.WithValue(resolveCtx, nettrace.TraceKey{}, &shadow)
|
||||
}
|
||||
|
||||
addrs, err := d.resolver().resolveAddrList(resolveCtx, "dial", network, address, d.LocalAddr)
|
||||
networkForResolve := network
|
||||
switch network {
|
||||
case "tcp", "udp":
|
||||
if !supportsIPv6() {
|
||||
networkForResolve = network + "4"
|
||||
}
|
||||
}
|
||||
addrs, err := d.resolver().resolveAddrList(resolveCtx, "dial", networkForResolve, address, d.LocalAddr)
|
||||
if err != nil {
|
||||
return nil, &OpError{Op: "dial", Net: network, Source: nil, Addr: nil, Err: err}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue