usa	2014-11-28 16:13:34 +0900 (Fri, 28 Nov 2014)

  New Revision: 48632

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

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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/net/http.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 48631)
+++ ruby_2_0_0/ChangeLog	(revision 48632)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Fri Nov 28 16:12:22 2014  NARUSE, Yui  <naruse@r...>
+
+	* lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead
+	  of parser to handle IPv6 address. [Bug #9129]
+
 Fri Nov 28 16:05:09 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (copy_stream_body): should write in binary mode.  based on a
Index: ruby_2_0_0/lib/net/http.rb
===================================================================
--- ruby_2_0_0/lib/net/http.rb	(revision 48631)
+++ ruby_2_0_0/lib/net/http.rb	(revision 48632)
@@ -1024,7 +1024,9 @@ module Net   #:nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/http.rb#L1024
 
     # 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_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 48631)
+++ ruby_2_0_0/version.h	(revision 48632)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-11-28"
-#define RUBY_PATCHLEVEL 601
+#define RUBY_PATCHLEVEL 602
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 11

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


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