kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/net/http.rb (edit_path): use path which is absolute ftp url

Browse source 
on using ftp_proxy.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-04-03 23:18:20 +00:00
parent 819e1756ad
commit 58835a94ef
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Apr 4 08:16:43 2015 NARUSE, Yui <naruse@ruby-lang.org>
* lib/net/http.rb (edit_path): use path which is absolute ftp url
on using ftp_proxy.
Fri Apr 3 11:43:17 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (vm_call0_cfunc): update invoker arguments.

8
lib/net/http.rb
View file

@ -1083,8 +1083,12 @@ module Net #:nodoc:
end
def edit_path(path)
if proxy? and not use_ssl? then
"http://#{addr_port}#{path}"
if proxy?
if path.start_with?("ftp://") || use_ssl?
path
else
"http://#{addr_port}#{path}"
end
else
path
end