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 | 75d115dec654027f0abbb4c56915dcba225e6ad8 (patch) | |
| tree | 222f15fb766598eecc70c49c3912a8ec2f9c978e | |
| parent | bd5c473b4b37ccd86dc592bc19168dd0afec99cd (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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/open-uri.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Dec 27 14:29:33 2008 Tanaka Akira <akr@fsij.org> + + * lib/open-uri.rb (OpenURI.redirectable?): permit https redirection. + patch from Roman Shterenzon. [ruby-core:20485] + Sat Dec 27 13:36:55 2008 Koichi Sasada <ko1@atdot.net> * eval.c (get_errinfo): return th->errinfo value diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 2a6c544fe..1584e3581 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: |