Backport #10530 ยป 0001-merge-revision-s-47079-Backport-9129.patch
| ChangeLog | ||
|---|---|---|
|
Thu Nov 20 16:22:30 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]
|
||
|
Wed Nov 19 10:19:36 2014 Eric Wong <e@80x24.org>
|
||
|
* vm_eval.c (rb_yield_splat): add missing GC guard
|
||
| lib/net/http.rb | ||
|---|---|---|
|
# 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.
|
||