diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/http.rb | 4 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Nov 28 16:12:22 2014 NARUSE, Yui <naruse@ruby-lang.org> + + * 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@ruby-lang.org> * io.c (copy_stream_body): should write in binary mode. based on a diff --git a/lib/net/http.rb b/lib/net/http.rb index 973998fdc3..a63be7f9a0 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1024,7 +1024,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,6 +1,6 @@ #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 |