mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
ff9782cfc9
commit
157832d922
2 changed files with 10 additions and 6 deletions
|
|
@ -1,3 +1,8 @@
|
|||
Wed Aug 18 23:41:33 2004 Minero Aoki <aamine@loveruby.net>
|
||||
|
||||
* 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 <eban@ruby-lang.org>
|
||||
|
||||
* ext/tcltklib/stubs.c (ruby_tcltk_stubs): need to call
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue