From 438dc524715f35ed8eb21ee234ed2aa322d0994f 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/trunk@6620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index fafaa35db..6afa32c6e 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:48:56 2004  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
-- 
cgit