Skip to content

Commit f947429

Browse files
committed
net: enable DualStack mode on Plan 9
DualStack mode requires dialTCP to support cancellation, which has been implemented for Plan 9 in CL 22144. Updates #11225. Updates #11932. Change-Id: I6e468363dc147326b097b604c122d5af80362787 Reviewed-on: https://go-review.googlesource.com/22204 Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent 4331ab9 commit f947429

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/net/dial.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package net
66

77
import (
88
"context"
9-
"runtime"
109
"time"
1110
)
1211

@@ -325,10 +324,8 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (Conn
325324
address: address,
326325
}
327326

328-
// DualStack mode requires that dialTCP support cancelation. This is
329-
// not available on plan9 (golang.org/issue/11225), so we ignore it.
330327
var primaries, fallbacks addrList
331-
if d.DualStack && network == "tcp" && runtime.GOOS != "plan9" {
328+
if d.DualStack && network == "tcp" {
332329
primaries, fallbacks = addrs.partition(isIPv4)
333330
} else {
334331
primaries = addrs

0 commit comments

Comments
 (0)