diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-12 08:40:23 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-12 08:40:23 +0000 |
commit | 8a0968895796cbe9b9cd5ffa4f555f6b91b87e03 (patch) | |
tree | 05b15e71f2bd7f166f8040647836bd3ed572f71b /lib/open-uri.rb | |
parent | a60b255a36c90ca0557de952f2d1a0955bb3dad7 (diff) |
* lib/open-uri.rb (OpenURI.open_loop): send authentication only for
the URI directly specified.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/open-uri.rb')
-rw-r--r-- | lib/open-uri.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 14e397b322..83bb756bb1 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -176,6 +176,11 @@ module OpenURI unless OpenURI.redirectable?(uri, redirect) raise "redirection forbidden: #{uri} -> #{redirect}" end + if options.include? :http_basic_authentication + # send authentication only for the URI directly specified. + options = options.dup + options.delete :http_basic_authentication + end uri = redirect raise "HTTP redirection loop: #{uri}" if uri_set.include? uri.to_s uri_set[uri.to_s] = true @@ -201,6 +206,11 @@ module OpenURI raise "Non-HTTP proxy URI: #{proxy}" if proxy.class != URI::HTTP end + if target.userinfo && "1.9.0" <= RUBY_VERSION + # don't raise for 1.8 because compatibility. + raise "userinfo not supported. [RFC3986]" + end + require 'net/http' klass = Net::HTTP if URI::HTTP === target |