diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-01-31 05:47:33 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-01-31 05:47:33 +0000 |
| commit | 83f7cab371a9e8a029369945bfca417ff5b99902 (patch) | |
| tree | ddd3594496fdafc60ba70de34306024b32c1d223 | |
| parent | 0af73052b8def5b73fd3743053cfd98b6fa13798 (diff) | |
| download | ruby-83f7cab371a9e8a029369945bfca417ff5b99902.tar.gz ruby-83f7cab371a9e8a029369945bfca417ff5b99902.tar.xz ruby-83f7cab371a9e8a029369945bfca417ff5b99902.zip | |
* lib/open-uri.rb (OpenURI::OpenURI.open_uri): use user and
password from URI unless http_basic_authentication is specified
explicitly. [ruby-core:10114]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/open-uri.rb | 3 |
2 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,9 @@ +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 diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 56c78f046..1ccb4f261 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -125,6 +125,9 @@ 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 || |