зеркало из https://github.com/github/ruby.git
* lib/net/http.rb (edit_path): use path which is absolute ftp url
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:
Родитель
819e1756ad
Коммит
58835a94ef
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче