From c33a807643c39713870cca66e0777e40bf4e45f5 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 16 Feb 2014 17:02:51 +0000
Subject: merge revision(s) r44637: [Backport #9385]

	* lib/open-uri.rb: Make proxy disabling working again.
	  Fixed by Christophe Philemotte.   [ruby-core:59650] [Bug #9385]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/open-uri.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 62e2669d66..6f04d056e3 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -288,7 +288,7 @@ module OpenURI
       end
     end
 
-    http = klass.new(target_host, target_port)
+    http = proxy ? klass.new(target_host, target_port) : klass.new(target_host, target_port, nil)
     if target.class == URI::HTTPS
       require 'net/https'
       http.use_ssl = true
-- 
cgit v1.2.3