naruse	2014-02-22 17:54:43 +0900 (Sat, 22 Feb 2014)

  New Revision: 45125

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45125

  Log:
    merge revision(s) 44637: [Backport #9385]
    
    * lib/open-uri.rb: Make proxy disabling working again.
      Fixed by Christophe Philemotte.   [ruby-core:59650] [Bug #9385]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/open-uri.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45124)
+++ ruby_2_1/ChangeLog	(revision 45125)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Feb 22 17:46:32 2014  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* eval.c (rb_mod_s_constants): return its own constants for other
Index: ruby_2_1/lib/open-uri.rb
===================================================================
--- ruby_2_1/lib/open-uri.rb	(revision 45124)
+++ ruby_2_1/lib/open-uri.rb	(revision 45125)
@@ -288,7 +288,7 @@ module OpenURI https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/open-uri.rb#L288
       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
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45124)
+++ ruby_2_1/version.h	(revision 45125)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44637


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/