From 42c7bb4d6aa4b5a3351c033dfa785ff51fa29e2f Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 18 Aug 2004 14:44:41 +0000
Subject: * lib/net/protocol.rb (rbuf_fill): OpenSSL::SSLSocket has its own
 buffer, select(2) might not work. [ruby-dev:24072]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/net/protocol.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 316f5e51a..ac6bce105 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -2,8 +2,8 @@
 # = net/protocol.rb
 #
 #--
-# Copyright (c) 1999-2003 Yukihiro Matsumoto
-# Copyright (c) 1999-2003 Minero Aoki
+# Copyright (c) 1999-2004 Yukihiro Matsumoto
+# Copyright (c) 1999-2004 Minero Aoki
 #
 # written and maintained by Minero Aoki <aamine@loveruby.net>
 #
@@ -193,10 +193,9 @@ module Net # :nodoc:
     private
 
     def rbuf_fill
-      until IO.select([@socket], nil, nil, @read_timeout)
-        raise TimeoutError, "socket read timeout (#{@read_timeout} sec)"
-      end
-      @rbuf << @socket.sysread(1024)
+      timeout(@read_timeout) {
+        @rbuf << @socket.sysread(1024)
+      }
     end
 
     def rbuf_moveto( dest, len )
-- 
cgit