merge revision(s) 44637: [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_1@45125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8abc8943b8..3faeda326b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 17:46:32 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb: Make proxy disabling working again.
+	  Fixed by Christophe Philemotte.   [ruby-core:59650] [Bug #9385]
+
 Sat Feb 22 17:33:39 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_mod_s_constants): return its own constants for other
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 26eb1a364e..264c8501cf 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
diff --git a/version.h b/version.h
index 6de4c639a7..d3149d7c03 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 69
+#define RUBY_PATCHLEVEL 70
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2