diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 04:38:46 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 04:38:46 +0000 |
| commit | 6adab3943fcadb9ba1384d75be0606e27adc2bc1 (patch) | |
| tree | 5aaf167a4f5a3154017f0574b75bac96ca36d123 /ext | |
| parent | 7978c87c078f13d034b2bfc5345d05732eb55241 (diff) | |
| download | ruby-6adab3943fcadb9ba1384d75be0606e27adc2bc1.tar.gz ruby-6adab3943fcadb9ba1384d75be0606e27adc2bc1.tar.xz ruby-6adab3943fcadb9ba1384d75be0606e27adc2bc1.zip | |
* ext/socket/init.c (s_recvfrom_nonblock): handles EAGAIN too.
* ext/socket/init.c (s_accept_nonblock): ditto, and EPROTO depends
on platforms.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/init.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/ext/socket/init.c b/ext/socket/init.c index 5cf0cbd85..908268c40 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -192,8 +192,13 @@ s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from) slen = recvfrom(fd, RSTRING_PTR(str), buflen, flags, (struct sockaddr*)&buf, &alen); if (slen < 0) { - if (errno == EWOULDBLOCK) + switch (errno) { + case EAGAIN: +#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN + case EWOULDBLOCK: +#endif rb_sys_fail("recvfrom(2) WANT_READ"); + } rb_sys_fail("recvfrom(2)"); } if (slen < RSTRING_LEN(str)) { @@ -455,8 +460,17 @@ s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen rb_io_set_nonblock(fptr); fd2 = accept(fptr->fd, (struct sockaddr*)sockaddr, len); if (fd2 < 0) { - if (errno == EWOULDBLOCK || errno == ECONNABORTED || errno == EPROTO) + switch (errno) { + case EAGAIN: +#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN + case EWOULDBLOCK: +#endif + case ECONNABORTED: +#if defined EPROTO + case EPROTO: +#endif rb_sys_fail("accept(2) WANT_READ"); + } rb_sys_fail("accept(2)"); } make_fd_nonblock(fd2); |