diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:40:37 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:40:37 +0000 |
commit | f54ed7a794f5814f16ae7d070febe0f152ea319f (patch) | |
tree | 222f15fb766598eecc70c49c3912a8ec2f9c978e /lib | |
parent | 02e2b50599415deafaf2fc148b628d42ce4c79b8 (diff) |
merges r21087 from trunk into ruby_1_9_1.
* lib/open-uri.rb (OpenURI.redirectable?): permit https redirection.
patch from Roman Shterenzon. [ruby-core:20485]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/open-uri.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 2a6c544fe6..1584e35817 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -240,7 +240,7 @@ module OpenURI # (RFC 2109 4.3.1, RFC 2965 3.3, RFC 2616 15.1.3) # However this is ad hoc. It should be extensible/configurable. uri1.scheme.downcase == uri2.scheme.downcase || - (/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:http|ftp)\z/i =~ uri2.scheme) + (/\A(?:https?|ftp)\z/i =~ uri1.scheme && /\A(?:https?|ftp)\z/i =~ uri2.scheme) end def OpenURI.open_http(buf, target, proxy, options) # :nodoc: |