* lib/open-uri.rb (OpenURI::OpenURI.open_uri): revert last change to conform RFC3986. [ruby-dev:30230]

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

ChangeLog

@@ -3,12 +3,6 @@ Wed Jan 31 14:52:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* test/ruby/test_iterator.rb (TestIterator::test_block_given_within_iterator):
 	  add new test.  [ruby-core:10125]
 
-Wed Jan 31 14:45:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/open-uri.rb (OpenURI::OpenURI.open_uri): use user and
-	  password from URI unless http_basic_authentication is specified
-	  explicitly.  [ruby-core:10114]
-
 Tue Jan 30 17:01:21 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* string.c (rb_str_sub_bang): calling rb_str_modify() should be just

lib/open-uri.rb

@@ -125,9 +125,6 @@ module OpenURI
     options = rest.shift if !rest.empty? && Hash === rest.first
     raise ArgumentError.new("extra arguments") if !rest.empty?
     options ||= {}
-    if uri.user and uri.password and not options[:http_basic_authentication]
-      options[:http_basic_authentication] = [uri.user,uri.password] 
-    end
     OpenURI.check_options(options)
 
     unless mode == nil ||