Merge pull request #38 from sourcery/master

Reference the top-level Timeout, to avoid conflicts with Rack::Timeout
This commit is contained in:
John Bintz 2013-05-24 05:31:54 -07:00
commit 85a27e6bec

View File

@ -45,7 +45,7 @@ module Rack
begin begin
http.send_request('GET', uri.path) http.send_request('GET', uri.path)
@use_vendored = false @use_vendored = false
rescue Timeout::Error, Errno::ECONNREFUSED, EOFError rescue ::Timeout::Error, Errno::ECONNREFUSED, EOFError
@use_vendored = true @use_vendored = true
rescue => e rescue => e
$stderr.puts e.inspect $stderr.puts e.inspect