diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2013-01-29 20:52:43 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2013-01-29 20:52:43 +0000 |
| commit | d6f2922e91928b5191a5c5f1b3a6b320712b5ce3 (patch) | |
| tree | 4f2fad1f4b778519bdd5941185c7e1d032af055b /libgo/go/net/file_unix.go | |
| parent | 91bfca59095b1cca9d4364996866848eaaf76c26 (diff) | |
| download | gcc-d6f2922e91928b5191a5c5f1b3a6b320712b5ce3.zip gcc-d6f2922e91928b5191a5c5f1b3a6b320712b5ce3.tar.gz gcc-d6f2922e91928b5191a5c5f1b3a6b320712b5ce3.tar.bz2 | |
libgo: Update Go library to master revision 15489/921e53d4863c.
From-SVN: r195560
Diffstat (limited to 'libgo/go/net/file_unix.go')
| -rw-r--r-- | libgo/go/net/file_unix.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libgo/go/net/file_unix.go b/libgo/go/net/file_unix.go index 0a64080..4c8403e 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 { |