diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-19 01:56:50 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-19 01:56:50 +0000 |
| commit | 7b041830d95d748a860f799352c3747e39a404cf (patch) | |
| tree | d953c87440748159e8c8e08d27464ad2ee5f4220 | |
| parent | 99756fdd8c209bbe7ecc1b6470c40e06d1e1d54d (diff) | |
| download | ruby-7b041830d95d748a860f799352c3747e39a404cf.tar.gz ruby-7b041830d95d748a860f799352c3747e39a404cf.tar.xz ruby-7b041830d95d748a860f799352c3747e39a404cf.zip | |
* ext/socket/lib/socket.rb (Socket.accept_loop): rescue
IO::WaitReadable instead of Errno::EWOULDBLOCK.
(Socket.udp_server_loop_on): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/lib/socket.rb | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sun Jul 19 10:54:56 2009 Tanaka Akira <akr@fsij.org> + + * ext/socket/lib/socket.rb (Socket.accept_loop): rescue + IO::WaitReadable instead of Errno::EWOULDBLOCK. + (Socket.udp_server_loop_on): ditto. + Sat Jul 18 23:44:59 2009 NARUSE, Yui <naruse@ruby-lang.org> * re.c (reg_enc_error): use rb_enc_get to get the encoding of diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb index 8d417487e..1f155e781 100644 --- a/ext/socket/lib/socket.rb +++ b/ext/socket/lib/socket.rb @@ -404,7 +404,7 @@ class Socket readable.each {|r| begin sock, addr = r.accept_nonblock - rescue Errno::EWOULDBLOCK + rescue IO::WaitReadable next end yield sock, addr @@ -567,7 +567,7 @@ class Socket readable.each {|r| begin msg, sender_addrinfo, rflags, *controls = r.recvmsg_nonblock - rescue Errno::EWOULDBLOCK + rescue IO::WaitReadable next end ai = r.local_address |