nagachika	2014-12-31 00:37:19 +0900 (Wed, 31 Dec 2014)

  New Revision: 49076

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

  Log:
    merge revision(s) r47079: [Backport #9129] [Backport #10531]
    
    * lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead
      of parser to handle IPv6 address. [Bug #9129]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/net/http.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49075)
+++ ruby_2_1/ChangeLog	(revision 49076)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Dec 31 00:00:09 2014  NARUSE, Yui  <naruse@r...>
+
+	* lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead
+	  of parser to handle IPv6 address. [Bug #9129]
+
 Tue Dec 30 23:46:26 2014  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* lib/rubygems/*: upgrade to RubyGems 2.2.3. [Backport #10515]
Index: ruby_2_1/lib/net/http.rb
===================================================================
--- ruby_2_1/lib/net/http.rb	(revision 49075)
+++ ruby_2_1/lib/net/http.rb	(revision 49076)
@@ -1026,7 +1026,9 @@ module Net   #:nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/net/http.rb#L1026
 
     # The proxy URI determined from the environment for this connection.
     def proxy_uri # :nodoc:
-      @proxy_uri ||= URI("http://#{address}:#{port}").find_proxy
+      @proxy_uri ||= URI::HTTP.new(
+        "http".freeze, nil, address, port, nil, nil, nil, nil, nil
+      ).find_proxy
     end
 
     # The address of the proxy server, if one is configured.
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49075)
+++ ruby_2_1/version.h	(revision 49076)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2014-12-30"
-#define RUBY_PATCHLEVEL 274
+#define RUBY_RELEASE_DATE "2014-12-31"
+#define RUBY_PATCHLEVEL 275
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_DAY 31
 
 #include "ruby/version.h"
 

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


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