merges r28557 from trunk into ruby_1_9_2. Fixes #4506.

--
* io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly
  to avoid select() on a socket which TCP state is CLOSED.
  patch by Eric Wong.  [ruby-core:31053]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 2 deletions

diff --git a/io.c b/io.c
index f99bc30f58..c9edc75c23 100644
--- a/io.c
+++ b/io.c
@@ -8218,8 +8218,7 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
         stp->total += ss;
         copy_length -= ss;
         if (0 < copy_length) {
-            ss = -1;
-            errno = EAGAIN;
+            goto retry_sendfile;
         }
     }
     if (ss == -1) {