From a4e4a24ce9654c2ff8fe02b0707eae5f7f6460f9 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 31 Jan 2007 06:10:06 +0000 Subject: * lib/open-uri.rb (OpenURI::OpenURI.open_uri): revert last change to conform RFC3986. [ruby-dev:30230] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11607 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ------ lib/open-uri.rb | 3 --- 2 files changed, 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c905610d5..a95fa93f3 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 1ccb4f261..56c78f046 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 || -- cgit