From 308977fadcfe002cf7267798ebd585d84281cbd1 Mon Sep 17 00:00:00 2001
From: akira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 13 Jul 2004 10:50:26 +0000
Subject: * lib/uri/generic.rb (URI::Generic#merge_path):  
 "URI('http://www.example.com/foo/..') + './'" should return  
 "URI('http://www.example.com/')".  [ruby-list:39838]  
 "URI('http://www.example.com/') + './foo/bar/..'" should return  
 "URI('http://www.example.com/foo/')".  [ruby-list:39844]

* test/uri/test_generic.rb (TestGeneric#test_merge): added tests.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index c12edaa12..601fd4cfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Jul 13 19:39:12 2004  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#merge_path):
+	  "URI('http://www.example.com/foo/..') + './'" should return
+	  "URI('http://www.example.com/')".  [ruby-list:39838]
+	  "URI('http://www.example.com/') + './foo/bar/..'" should return
+	  "URI('http://www.example.com/foo/')".  [ruby-list:39844]
+
+	* test/uri/test_generic.rb (TestGeneric#test_merge): added tests.
+
 Tue Jul 13 15:51:45 2004  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
@@ -68,7 +78,7 @@ Thu Jul  8 22:52:19 2004  Kouhei Sutou  <kou@cozmixng.org>
 	* test/rss/{test_trackback,rss-testcase}.rb: fixed no good method
 	  name.
 
-Thu Jul  8 00:05:23 2004  akira yamada  <akira@arika.org>
+Thu Jul  8 00:05:23 2004  akira yamada  <akira@ruby-lang.org>
 
 	* lib/tempfile.rb (Tempfile::initialize): got out code of
 	  generating tmpname.  [ruby-dev:23832][ruby-dev:23837]
-- 
cgit