yugui	2011-05-31 09:11:17 +0900 (Tue, 31 May 2011)

  New Revision: 31829

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

  Log:
    merges r31405 from trunk into ruby_1_9_2.
    --
    * ext/socket/init.c (rsock_connect): add to care EINTR. based
      on a patch from Eric Wong at [ruby-core:35621][Bug #4555]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/socket/init.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31828)
+++ ruby_1_9_2/ChangeLog	(revision 31829)
@@ -1,3 +1,8 @@
+Mon May  2 00:36:12 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* ext/socket/init.c (rsock_connect): add to care EINTR. based
+	  on a patch from Eric Wong at [ruby-core:35621][Bug #4555]
+
 Sat Apr 30 03:25:53 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* test/io/wait/test_io_wait.rb: New. for testing ext/io/wait.
Index: ruby_1_9_2/ext/socket/init.c
===================================================================
--- ruby_1_9_2/ext/socket/init.c	(revision 31828)
+++ ruby_1_9_2/ext/socket/init.c	(revision 31829)
@@ -383,6 +383,12 @@
 	status = (int)BLOCKING_REGION(func, &arg);
 	if (status < 0) {
 	    switch (errno) {
+	      case EINTR:
+#if defined(ERESTART)
+	      case ERESTART:
+#endif
+		continue;
+
 	      case EAGAIN:
 #ifdef EINPROGRESS
 	      case EINPROGRESS:
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31828)
+++ ruby_1_9_2/version.h	(revision 31829)
@@ -1,13 +1,13 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 246
+#define RUBY_PATCHLEVEL 247
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 30
-#define RUBY_RELEASE_DATE "2011-05-30"
+#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_DATE "2011-05-31"
 
 #include "ruby/version.h"
 

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