yugui	2011-05-31 10:49:45 +0900 (Tue, 31 May 2011)

  New Revision: 31845

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31845

  Log:
    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]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/io.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31844)
+++ ruby_1_9_2/ChangeLog	(revision 31845)
@@ -1,3 +1,9 @@
+Tue Jul  6 22:57:21 2010  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* insns.def (opt_mult): as r31805, volatile it.
Index: ruby_1_9_2/io.c
===================================================================
--- ruby_1_9_2/io.c	(revision 31844)
+++ ruby_1_9_2/io.c	(revision 31845)
@@ -8218,8 +8218,7 @@
         stp->total += ss;
         copy_length -= ss;
         if (0 < copy_length) {
-            ss = -1;
-            errno = EAGAIN;
+            goto retry_sendfile;
         }
     }
     if (ss == -1) {
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31844)
+++ ruby_1_9_2/version.h	(revision 31845)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/