[ruby-core:23917] ruby 1.8/1.9 URI merge call for FTP uris is broken.

Hi!

r16085 in ruby_1_8_7 and subsequent commit in 1.9 broke the
URI.merge method for ftp uris.  This commit overrided the generic
"path" call of the URI class with the method specific to ftp
that return the path without leading '/' to conform with FTP RFC.
Yet this method is also used internally withing URI module to
implement the "merge" method, which now smashes ftp uris.  This
can be verified by following code:

% #!/usr/bin/env ruby
% require 'uri'
% print URI.parse("ftp://localhost/abc/def/") + "../"
% print "\n"

For current ruby version this will print
ftp://localhostabc/ ,
which is obviously incorrect.

The following patch fixes this for me:

--- lib/uri/generic.rb.orig	2009-06-18 16:47:45.000000000 +0400
+++ lib/uri/generic.rb	2009-06-18 16:48:54.000000000 +0400
@@ -1032,7 +1032,15 @@
           end
         end
=20
-        str << path_query
+        path =3D path_query
+
+        #
+        # Add URI delimiter if the path misses it (like as in FTP)
+        #
+        if not path.empty? and not str.empty? and path[0, 1] !=3D '/'
+          path =3D '/' + path=20
+        end
+        str << path
       end
=20
       if @fragment

Basically, we're checking if we need a separator here, and if we do
and the path itself doesn't start with '/' we're adding it explicitly.

--=20
Stanislav Sedov
ST4096-RIPE