summaryrefslogtreecommitdiff
path: root/libgo/go/net/file_unix.go
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-29 20:52:43 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-29 20:52:43 +0000
commit12ebd6294172cc1108bbadab78fea03e890a6da4 (patch)
tree4f2fad1f4b778519bdd5941185c7e1d032af055b /libgo/go/net/file_unix.go
parent6effa4dc115122a3a4838de0a302dfcadcefeeca (diff)
libgo: Update Go library to master revision 15489/921e53d4863c.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195560 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/net/file_unix.go')
-rw-r--r--libgo/go/net/file_unix.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/libgo/go/net/file_unix.go b/libgo/go/net/file_unix.go
index 0a640801779a..4c8403e40631 100644
--- a/libgo/go/net/file_unix.go
+++ b/libgo/go/net/file_unix.go
@@ -20,6 +20,10 @@ func newFileFD(f *os.File) (*netFD, error) {
}
syscall.CloseOnExec(fd)
syscall.ForkLock.RUnlock()
+ if err = syscall.SetNonblock(fd, true); err != nil {
+ closesocket(fd)
+ return nil, err
+ }
sotype, err := syscall.GetsockoptInt(fd, syscall.SOL_SOCKET, syscall.SO_TYPE)
if err != nil {