crypto/tls: make SetReadTimeout work.

        Fixes #1181.

R=rsc, agl1, cw, r2
CC=golang-dev
https://golang.org/cl/2414041

diff --git a/src/pkg/crypto/tls/conn.go b/src/pkg/crypto/tls/conn.go
index 9bf9f21851d1c444fffd68c4be4038a246e4304b..b18cda7bbaa7c49818b4cde40be4db1a5578494c 100644 (file)
--- a/src/pkg/crypto/tls/conn.go
+++ b/src/pkg/crypto/tls/conn.go
@@ -598,7 +598,10 @@ func (c *Conn) Read(b []byte) (n int, err os.Error) {
        defer c.in.Unlock()
 
        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 {
                return 0, c.err