From f947429983d3906127432120b49fa3362e7de374 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Tue, 19 Apr 2016 03:24:21 +0200 Subject: [PATCH] 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 --- src/net/dial.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/net/dial.go b/src/net/dial.go index 59e41f536b..3443161004 100644 --- a/src/net/dial.go +++ b/src/net/dial.go @@ -6,7 +6,6 @@ package net import ( "context" - "runtime" "time" ) @@ -325,10 +324,8 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (Conn address: address, } - // DualStack mode requires that dialTCP support cancelation. This is - // not available on plan9 (golang.org/issue/11225), so we ignore it. var primaries, fallbacks addrList - if d.DualStack && network == "tcp" && runtime.GOOS != "plan9" { + if d.DualStack && network == "tcp" { primaries, fallbacks = addrs.partition(isIPv4) } else { primaries = addrs -- 2.48.1