diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-30 15:37:19 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-30 15:37:19 +0000 |
| commit | c6aaa9821f55e5a176bb78f816de7a05bd86206d (patch) | |
| tree | 1fbe1dc621f6d99dcbdecdb5476d936acad1fe8e | |
| parent | 67e62b9216f812ebed238e01cb6a41a550323e46 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/http.rb | 4 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Wed Dec 31 00:00:09 2014 NARUSE, Yui <[email protected]> + + * 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 <[email protected]> * lib/rubygems/*: upgrade to RubyGems 2.2.3. [Backport #10515] diff --git a/lib/net/http.rb b/lib/net/http.rb index a1b8d691bb..954644fb00 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1026,7 +1026,9 @@ module Net #:nodoc: # 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. @@ -1,10 +1,10 @@ #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" |