aboutsummaryrefslogtreecommitdiffstats
path: root/lib/webrick
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-06 20:30:43 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-06 20:30:43 +0000
commit84b012e02a567f79dc3061cd860be982f95be048 (patch)
tree78dc35d87193481c49ff2c0ec1c2dd30639867be /lib/webrick
parent8e08552ed01e827b4e3ca3e0d57695a8737cb394 (diff)
downloadruby-84b012e02a567f79dc3061cd860be982f95be048.tar.gz
stdlib: use IO#wait_*able instead of IO.select when possible
In case a process encounters high-numbered FDs, this allows consistent performance on systems with ppoll support. [ruby-core:35572] * ext/socket/lib/socket.rb (connect_nonblock): use IO#wait_writable * lib/drb/drb.rb (DRB::DRbTCPSocket#alive?): use IO#wait_readable * lib/webrick/httpserver.rb (run): ditto * lib/resolv.rb (request): ditto for single socket case [ruby-core:68943] [Feature #11081] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick')
-rw-r--r--lib/webrick/httpserver.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index 0618489c53..96bd3fa548 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -8,6 +8,7 @@
#
# $IPR: httpserver.rb,v 1.63 2002/10/01 17:16:32 gotoyuzo Exp $
+require 'io/wait'
require 'webrick/server'
require 'webrick/httputils'
require 'webrick/httpstatus'
@@ -72,7 +73,7 @@ module WEBrick
begin
timeout = @config[:RequestTimeout]
while timeout > 0
- break if IO.select([sock], nil, nil, 0.5)
+ break if sock.to_io.wait_readable(0.5)
break if @status != :Running
timeout -= 0.5
end