kris/th5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypto/tls: make SetReadTimeout work.

Browse Source 
Fixes #1181.

R=rsc, agl1, cw, r2
CC=golang-dev
https://golang.org/cl/2414041
This commit is contained in:
Adam Langley 2010-10-11 10:41:01 -04:00
parent dd9f217e6a
commit 597324882f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conn.go
View File

@ -598,7 +598,10 @@ func (c *Conn) Read(b []byte) (n int, err os.Error) {
defer c.in.Unlock() defer c.in.Unlock()
for c.input == nil && c.err == nil { for c.input == nil && c.err == nil {
c.readRecord(recordTypeApplicationData) if err := c.readRecord(recordTypeApplicationData); err != nil {
// Soft error, like EAGAIN
return 0, err
}
} }
if c.err != nil { if c.err != nil {
return 0, c.err return 0, c.err