diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 00:11:17 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 00:11:17 +0000 |
| commit | d3818d6b55af209f9e75a3dda098510a525fcd71 (patch) | |
| tree | f7fd5c3ee519b4399f3b3ffedd052514b862bc57 | |
| parent | 766c32adc3c2d6848fea2e7d7976bdb9f26487b9 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/init.c | 6 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon May 2 00:36:12 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * 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@gmail.com> * test/io/wait/test_io_wait.rb: New. for testing ext/io/wait. diff --git a/ext/socket/init.c b/ext/socket/init.c index ffd1c72895..48718313f0 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -383,6 +383,12 @@ rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks) 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: @@ -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" |