From 04b08da9af0c450d645ab7389d1467308cfc2db8 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 4 Mar 2013 21:27:36 +0100 Subject: Imported Upstream version 1.1~hg20130304 --- src/pkg/net/sendfile_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pkg/net/sendfile_linux.go') diff --git a/src/pkg/net/sendfile_linux.go b/src/pkg/net/sendfile_linux.go index a0d530362..3357e6538 100644 --- a/src/pkg/net/sendfile_linux.go +++ b/src/pkg/net/sendfile_linux.go @@ -58,8 +58,8 @@ func sendFile(c *netFD, r io.Reader) (written int64, err error, handled bool) { if n == 0 && err1 == nil { break } - if err1 == syscall.EAGAIN && c.wdeadline >= 0 { - if err1 = pollserver.WaitWrite(c); err1 == nil { + if err1 == syscall.EAGAIN { + if err1 = c.pollServer.WaitWrite(c); err1 == nil { continue } } -- cgit v1.2.3