summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-22 11:49:20 +0000
committerakira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-22 11:49:20 +0000
commit88695fc0ea105d16f3c40be0119c18ff7306331b (patch)
tree9779cc9bc82e803b6d154a588e2fe171e705db32
parent3fdd33b70c8128469fabb168edbd5a5b33ca9cfe (diff)
* lib/uri/generic.rb (URI::Generic#route_from): accepts urls which
has no host-part. * test/uri/test_generic.rb (TestGeneric::test_route): added a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/uri/generic.rb2
-rw-r--r--test/uri/test_generic.rb3
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eb02f4f676..85b520c9fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Dec 22 20:44:36 2003 akira yamada <akira@ruby-lang.org>
+
+ * lib/uri/generic.rb (URI::Generic#route_from): accepts urls which
+ has no host-part.
+
+ * test/uri/test_generic.rb (TestGeneric::test_route): added a test.
+
Mon Dec 22 20:38:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/cgi.rb: reduce eval.
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index d0eb403158..4ebe1fb0a3 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -947,7 +947,7 @@ Object
self.query, self.fragment)
if rel.userinfo != oth.userinfo ||
- rel.host.downcase != oth.host.downcase ||
+ rel.host.to_s.downcase != oth.host.to_s.downcase ||
rel.port != oth.port
rel.set_port(nil) if rel.port == oth.default_port
return rel, rel
diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb
index a982d4e1cf..34876ebaed 100644
--- a/test/uri/test_generic.rb
+++ b/test/uri/test_generic.rb
@@ -177,6 +177,9 @@ class TestGeneric < Test::Unit::TestCase
url = URI.parse('http://hoge/a/b/').route_to('http://MOGE/b/')
assert_equal('//MOGE/b/', url.to_s)
+
+ url = URI.parse('file:///a/b/').route_to('file:///a/b/')
+ assert_equal('', url.to_s)
end
def test_rfc2396_examples