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 | 900546717ef0be7fcc991575e99659d9a9d11144 (patch) | |
tree | ddd3594496fdafc60ba70de34306024b32c1d223 /lib/open-uri.rb | |
parent | f5883fbe87ebb92cc65e9c71af433d704e8f0dc3 (diff) |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@11604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/open-uri.rb')
-rw-r--r-- | lib/open-uri.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 56c78f0468..1ccb4f2614 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 || |