Merge this too.

       * lib/uri/ftp.rb, lib/uri/generic.rb, test/uri/test_common.rb,
         test/uri/test_ftp.rb, test/uri/test_generic.rb: backported from 1.9.
         [ruby-dev:31318]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 14 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index 835f44bf64..722dd8fe16 100644
--- a/NEWS
+++ b/NEWS
@@ -306,6 +306,17 @@ with all sufficient information, see the ChangeLog file.
 * uri
 
   * added LDAPS scheme.
+  * Change for RFC3986:
+    * FTP
+      * URI('ftp://example.com/foo').path #=> 'foo'
+      * URI('ftp://example.com/%2Ffoo').path #=> '/foo'
+      * URI::FTP.build([nil, 'example.com', nil, '/foo', 'i').to_s #=> 'ftp://example.com/%2Ffoo;type=i'
+    * URI merge
+      * URI('http://a/b/c/d;p?q').merge('?y') == URI('http://a/b/c/d;p?y')
+      * URI('http://a/b/c/d;p?q').merge('/./g') == URI('http://a/g')
+      * URI('http://a/b/c/d;p?q').merge('/../g') == URI('http://a/g')
+      * URI('http://a/b/c/d;p?q').merge('../../../g') == URI('http://a/g')
+      * URI('http://a/b/c/d;p?q').merge('../../../../g') == URI('http://a/g')
 
 * rss
 
@@ -334,6 +345,9 @@ with all sufficient information, see the ChangeLog file.
   * New method:
     * Dir.mktmpdir
 
+* uri
+
+  * See above for details.
 
 == Changes since the 1.8.5 release