summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@getchef.com>2014-12-08 12:55:07 -0800
committerdanielsdeleo <dan@getchef.com>2014-12-08 14:36:42 -0800
commitd65d1c2879025a5648c7cea03c3798cf8bb4bd94 (patch)
treeea7c3b1da59d7923560cc50e97d447f0844ebfd4
parent647e90ab9b778e92777f54c7201f70656afcf6cc (diff)
downloadchef-d65d1c2879025a5648c7cea03c3798cf8bb4bd94.tar.gz
Update Net::HTTP IPv6 monkey patch w/ version info
-rw-r--r--lib/chef/monkey_patches/net_http.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/chef/monkey_patches/net_http.rb b/lib/chef/monkey_patches/net_http.rb
index 083db2216b..9c8044a9a7 100644
--- a/lib/chef/monkey_patches/net_http.rb
+++ b/lib/chef/monkey_patches/net_http.rb
@@ -42,6 +42,10 @@ if Net::HTTP.instance_methods.map {|m| m.to_s}.include?("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