diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-14 15:41:54 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-14 15:41:54 +0000 |
| commit | 7da93e24295c8b313ecdcedee0b8bde70b335e61 (patch) | |
| tree | e3de46cbc89d82ca1f49843fe2e1e670db67795e /libgo/go/net/http/transport.go | |
| parent | f86a7907050666ce7cab2890b353619f83d6c98b (diff) | |
| download | gcc-7da93e24295c8b313ecdcedee0b8bde70b335e61.tar.gz | |
libgo: Update to weekly.2011-12-06.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182338 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/net/http/transport.go')
| -rw-r--r-- | libgo/go/net/http/transport.go | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libgo/go/net/http/transport.go b/libgo/go/net/http/transport.go index e622e41f0a2..dc70be43f2d 100644 --- a/libgo/go/net/http/transport.go +++ b/libgo/go/net/http/transport.go @@ -519,17 +519,11 @@ func (pc *persistConn) readLoop() { for alive { pb, err := pc.br.Peek(1) - if err != nil { - if remoteSideClosed(err) && !pc.expectingResponse() { - // Remote side closed on us. (We probably hit their - // max idle timeout) - pc.close() - return - } - } if !pc.expectingResponse() { - log.Printf("Unsolicited response received on idle HTTP channel starting with %q; err=%v", - string(pb), err) + if len(pb) > 0 { + log.Printf("Unsolicited response received on idle HTTP channel starting with %q; err=%v", + string(pb), err) + } pc.close() return } |