From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Thu, 19 May 2016 03:04:10 +0000 (+0900)
Subject: net: don't return io.EOF from zero byte reads on Plan 9
X-Git-Tag: go1.7beta1~159
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8d428ed218d2b65dbb4abbd9be870c95439a2b14;p=gostls13.git

net: don't return io.EOF from zero byte reads on Plan 9

Updates #15735.
Fixes #15741.

Change-Id: Ic4ad7e948e8c3ab5feffef89d7a37417f82722a1
Reviewed-on: https://go-review.googlesource.com/23199
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/net/fd_plan9.go b/src/net/fd_plan9.go
index 8e272b1eb8..7533232dc9 100644
--- a/src/net/fd_plan9.go
+++ b/src/net/fd_plan9.go
@@ -76,6 +76,9 @@ func (fd *netFD) Read(b []byte) (n int, err error) {
 		return 0, err
 	}
 	defer fd.readUnlock()
+	if len(b) == 0 {
+		return 0, nil
+	}
 	n, err = fd.data.Read(b)
 	if isHangup(err) {
 		err = io.EOF