From 157832d922a914ff1b995f4b105503bd32fb17d2 Mon Sep 17 00:00:00 2001 From: aamine 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/net/protocol.rb | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e18da9169f..383cb1db56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 18 23:41:33 2004 Minero Aoki + + * lib/net/protocol.rb (rbuf_fill): OpenSSL::SSLSocket has its own + buffer, select(2) might not work. [ruby-dev:24072] + Wed Aug 18 17:10:12 2004 WATANABE Hirofumi * ext/tcltklib/stubs.c (ruby_tcltk_stubs): need to call diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index 316f5e51a2..ac6bce1058 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 # @@ -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 v1.2.3