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

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 615f6392ff..1e74313271 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul  6 22:57:21 2010  Tanaka Akira  <akr@fsij.org>
+
+	* 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]
+
 Mon May 30 15:44:16 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* insns.def (opt_mult): as r31805, volatile it.
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) {
diff --git a/version.h b/version.h
index c072877c08..bb85087dcd 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 262
+#define RUBY_PATCHLEVEL 263
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1