Fix net/http monkey patch, to prevent conflicts with other libraries.
Using the patch included in http://redmine.ruby-lang.org/issues/show/806
This commit is contained in:
parent
813f673d88
commit
d95b9de50d
|
@ -31,13 +31,19 @@ if RUBY_VERSION.to_f < 1.9
|
||||||
class Net::BufferedIO #:nodoc:
|
class Net::BufferedIO #:nodoc:
|
||||||
alias :old_rbuf_fill :rbuf_fill
|
alias :old_rbuf_fill :rbuf_fill
|
||||||
def rbuf_fill
|
def rbuf_fill
|
||||||
begin
|
if @io.respond_to?(:read_nonblock)
|
||||||
@rbuf << @io.read_nonblock(65536)
|
begin
|
||||||
rescue Errno::EWOULDBLOCK
|
|
||||||
if IO.select([@io], nil, nil, @read_timeout)
|
|
||||||
@rbuf << @io.read_nonblock(65536)
|
@rbuf << @io.read_nonblock(65536)
|
||||||
else
|
rescue Errno::EWOULDBLOCK
|
||||||
raise Timeout::Error
|
if IO.select([@io], nil, nil, @read_timeout)
|
||||||
|
retry
|
||||||
|
else
|
||||||
|
raise Timeout::TimeoutError
|
||||||
|
end
|
||||||
|
end
|
||||||
|
else
|
||||||
|
timeout(@read_timeout) do
|
||||||
|
@rbuf << @io.sysread(65536)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue