diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-01 15:38:53 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-01 15:38:53 +0000 |
| commit | 49b4510cd1ca220e9ec51ad269c6544ca9610ca3 (patch) | |
| tree | 987b6fd34dfecb401604ee2e27e24df9daf7b676 | |
| parent | 4d88169267a8614c36e9fbe389dd3fadba25cdc5 (diff) | |
* 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/trunk@31405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/init.c | 6 |
2 files changed, 11 insertions, 0 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] + Sun May 1 01:06:24 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * thread.c (rb_thread_select): release GVL while waiting select(). diff --git a/ext/socket/init.c b/ext/socket/init.c index 137027a531..ee88e81bae 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_FD(func, &arg); if (status < 0) { switch (errno) { + case EINTR: +#if defined(ERESTART) + case ERESTART: +#endif + continue; + case EAGAIN: #ifdef EINPROGRESS case EINPROGRESS: |