diff options
| author | Tim Smith <tsmith84@gmail.com> | 2019-12-30 13:12:55 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2019-12-30 13:12:55 -0800 |
| commit | d048c26fb3159833a8ce6bc5813bc9e28a089b29 (patch) | |
| tree | fec56c74c933fb807fa054b1717dfed63cd309c5 | |
| parent | 381066a69c4c02cac8f27f79cc364a2f42a317a8 (diff) | |
| download | chef-nethttp.tar.gz | |
Remove legacy Net::HTTP not needed in Ruby 2.2+nethttp
There's no need to monkeypatch this anymore.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/monkey_patches/net_http.rb | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/lib/chef/monkey_patches/net_http.rb b/lib/chef/monkey_patches/net_http.rb index a50b7fd74c..07918a8c1f 100644 --- a/lib/chef/monkey_patches/net_http.rb +++ b/lib/chef/monkey_patches/net_http.rb @@ -24,41 +24,3 @@ module Net include ChefNetHTTPExceptionExtensions end end - -if Net::HTTP.instance_methods.map(&:to_s).include?("proxy_uri") - begin - # Ruby 2.0 changes the way proxy support is implemented in Net::HTTP. - # The implementation does not work correctly with IPv6 literals because it - # concatenates the address into a URI without adding square brackets for - # IPv6 addresses. - # - # If the bug is present, a call to Net::HTTP#proxy_uri when the host is an - # IPv6 address will fail by creating an invalid URI, like so: - # - # ruby -r'net/http' -e 'Net::HTTP.new("::1", 80).proxy_uri' - # /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/generic.rb:214:in `initialize': the scheme http does not accept registry part: ::1:80 (or bad hostname?) (URI::InvalidURIError) - # from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/http.rb:84:in `initialize' - # from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/common.rb:214:in `new' - # from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/common.rb:214:in `parse' - # from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/common.rb:747:in `parse' - # from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/uri/common.rb:994:in `URI' - # from /Users/ddeleo/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/net/http.rb:1027:in `proxy_uri' - # from -e:1:in `<main>' - # - # https://bugs.ruby-lang.org/issues/9129 - # - # NOTE: This should be fixed in Ruby 2.2.0, and backported to Ruby 2.0 and - # 2.1 (not yet released so the version/patchlevel required isn't known - # yet). - Net::HTTP.new("::1", 80).proxy_uri - rescue URI::InvalidURIError - class Net::HTTP - - def proxy_uri # :nodoc: - ipv6_safe_addr = address.to_s.include?(":") ? "[#{address}]" : address - @proxy_uri ||= URI("http://#{ipv6_safe_addr}:#{port}").find_proxy - end - - end - end -end |