From 5effdad2cdd0807eca83ea2cdbddc70f4f3fe02f Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 27 Dec 2008 05:30:58 +0000 Subject: [PATCH] * 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/trunk@21087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/open-uri.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a38c67993e..40e3cc017b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 27 14:29:33 2008 Tanaka Akira + + * 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 * eval.c (get_errinfo): return th->errinfo value 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: