matz	2008-12-24 00:24:54 +0900 (Wed, 24 Dec 2008)

  New Revision: 20955

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

  Log:
    * lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): avoid calling
      read_nonblock in rescue.  use retry instead.

  Modified files:
    trunk/ChangeLog
    trunk/lib/net/protocol.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20954)
+++ ChangeLog	(revision 20955)
@@ -171,6 +171,11 @@
 
 	* ext/tk/tcltklib.c: fix wrong flag value.
 
+Mon Dec 22 15:15:58 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): avoid calling
+	  read_nonblock in rescue.  use retry instead.
+
 Mon Dec 22 14:35:59 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* string.c (rb_external_str_new_with_enc): set ASCII-8BIT if
Index: lib/net/protocol.rb
===================================================================
--- lib/net/protocol.rb	(revision 20954)
+++ lib/net/protocol.rb	(revision 20955)
@@ -135,7 +135,7 @@
         @rbuf << @io.read_nonblock(BUFSIZE)
       rescue Errno::EWOULDBLOCK
         if IO.select([@io], nil, nil, @read_timeout)
-          @rbuf << @io.read_nonblock(BUFSIZE)
+          retry
         else
           raise Timeout::TimeoutError
         end

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