diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/net/http/generic_request.rb | 2 | ||||
| -rw-r--r-- | lib/net/protocol.rb | 5 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Thu Apr 16 05:09:36 2015 Eric Wong <e@80x24.org> + + * lib/net/protocol.rb (rbuf_fill): use IO#wait_*able + * lib/net/http/generic_request.rb (wait_for_continue): ditto + [ruby-core:68891] [Feature #11056] + Wed Apr 15 18:43:43 2015 Koichi Sasada <ko1@atdot.net> * vm_trace.c (rb_tracepoint_new): fix documentation. diff --git a/lib/net/http/generic_request.rb b/lib/net/http/generic_request.rb index 00ff434ccf..9b7d28757d 100644 --- a/lib/net/http/generic_request.rb +++ b/lib/net/http/generic_request.rb @@ -309,7 +309,7 @@ class Net::HTTPGenericRequest def wait_for_continue(sock, ver) if ver >= '1.1' and @header['expect'] and @header['expect'].include?('100-continue') - if IO.select([sock.io], nil, nil, sock.continue_timeout) + if sock.io.to_io.wait_readable(sock.continue_timeout) res = Net::HTTPResponse.read_new(sock) unless res.kind_of?(Net::HTTPContinue) res.decode_content = @decode_content diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index 5a20c5d515..28833a25ef 100644 --- a/lib/net/protocol.rb +++ b/lib/net/protocol.rb @@ -20,6 +20,7 @@ require 'socket' require 'timeout' +require 'io/wait' module Net # :nodoc: @@ -153,12 +154,12 @@ module Net # :nodoc: when String return @rbuf << rv when :wait_readable - IO.select([@io], nil, nil, @read_timeout) or raise Net::ReadTimeout + @io.to_io.wait_readable(@read_timeout) or raise Net::ReadTimeout # continue looping when :wait_writable # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable. # http://www.openssl.org/support/faq.html#PROG10 - IO.select(nil, [@io], nil, @read_timeout) or raise Net::ReadTimeout + @io.to_io.wait_writable(@read_timeout) or raise Net::ReadTimeout # continue looping when nil # callers do not care about backtrace, so avoid allocating for it |