From c91aea6c31374852c2d50a2a94b286c6c5d55ae0 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 12 May 2014 08:48:19 -0700 Subject: [PATCH] undo CL 92210044 / 5cb21eee2d35 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ««« original CL description net: make use of SO_LINGER_SEC on darwin Fixes #7971. LGTM=iant R=golang-codereviews, iant CC=golang-codereviews https://golang.org/cl/92210044 »»» TBR=iant R=golang-codereviews CC=golang-codereviews https://golang.org/cl/96220049 --- src/pkg/net/sockopt_posix.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/pkg/net/sockopt_posix.go b/src/pkg/net/sockopt_posix.go index 0bfaecea41..921918c37f 100644 --- a/src/pkg/net/sockopt_posix.go +++ b/src/pkg/net/sockopt_posix.go @@ -8,7 +8,6 @@ package net import ( "os" - "runtime" "syscall" ) @@ -138,9 +137,5 @@ func setLinger(fd *netFD, sec int) error { return err } defer fd.decref() - opt := syscall.SO_LINGER - if runtime.GOOS == "darwin" { - opt = syscall.SO_LINGER_SEC - } - return os.NewSyscallError("setsockopt", syscall.SetsockoptLinger(fd.sysfd, syscall.SOL_SOCKET, opt, &l)) + return os.NewSyscallError("setsockopt", syscall.SetsockoptLinger(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_LINGER, &l)) } -- 2.50.0