Project

General

Profile

Backport #10530 ยป 0001-merge-revision-s-47079-Backport-9129.patch

jrafanie (Joe Rafaniello), 11/20/2014 04:27 PM

View differences:

ChangeLog
1
Thu Nov 20 16:22:30 2014  NARUSE, Yui  <naruse@ruby-lang.org>
2

  
3
	* lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead
4
	  of parser to handle IPv6 address. [Bug #9129]
5

  
1 6
Wed Nov 19 10:19:36 2014  Eric Wong  <e@80x24.org>
2 7

  
3 8
	* vm_eval.c (rb_yield_splat): add missing GC guard
lib/net/http.rb
1024 1024

  
1025 1025
    # The proxy URI determined from the environment for this connection.
1026 1026
    def proxy_uri # :nodoc:
1027
      @proxy_uri ||= URI("http://#{address}:#{port}").find_proxy
1027
      @proxy_uri ||= URI::HTTP.new(
1028
        "http".freeze, nil, address, port, nil, nil, nil, nil, nil
1029
      ).find_proxy
1028 1030
    end
1029 1031

  
1030 1032
    # The address of the proxy server, if one is configured.