diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/http.rb | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -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. diff --git a/lib/net/http.rb b/lib/net/http.rb index 37b6b82694..2fc541c2e8 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -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 |