diff --git a/ChangeLog b/ChangeLog index c905610d52..a95fa93f35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,12 +3,6 @@ Wed Jan 31 14:52:09 2007 Yukihiro Matsumoto * 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 - - * 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 * string.c (rb_str_sub_bang): calling rb_str_modify() should be just diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 1ccb4f2614..56c78f0468 100644 --- a/lib/open-uri.rb +++ b/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 ||