akr	2014-01-28 20:54:36 +0900 (Tue, 28 Jan 2014)

  New Revision: 44727

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

  Log:
    * process.c (READ_FROM_CHILD): Apply the last hunk of
      0001-process.c-avoid-EINTR-from-Process.spawn.patch written by
      Eric Wong in [Bug #8770].

  Modified files:
    trunk/ChangeLog
    trunk/process.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44726)
+++ ChangeLog	(revision 44727)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Jan 28 20:51:07 2014  Tanaka Akira  <akr@f...>
+
+	* process.c (READ_FROM_CHILD): Apply the last hunk of
+	  0001-process.c-avoid-EINTR-from-Process.spawn.patch written by
+	  Eric Wong in [Bug #8770].
+
 Tue Jan 28 16:33:18 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread_pthread.c (ruby_init_stack, ruby_stack_overflowed_p):
Index: process.c
===================================================================
--- process.c	(revision 44726)
+++ process.c	(revision 44727)
@@ -3362,7 +3362,7 @@ recv_child_error(int fd, int *statep, VA https://github.com/ruby/ruby/blob/trunk/process.c#L3362
         *excp = exc;
     }
 #define READ_FROM_CHILD(ptr, len) \
-    (NIL_P(io) ? read(fd, (ptr), (len)) : rb_io_bufread(io, (ptr), (len)))
+    (NIL_P(io) ? read_retry(fd, (ptr), (len)) : rb_io_bufread(io, (ptr), (len)))
     if ((size = READ_FROM_CHILD(&err, sizeof(err))) < 0) {
         err = errno;
     }

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