From 7a65b1c0234f07c980d317702a3ebcf6cab00e7d Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 7 Sep 2016 07:14:30 +0000 Subject: lib/open-uri.rb: Allow http to https redirection. * lib/open-uri.rb: Allow http to https redirection. Note that https to http is still forbidden. [ruby-core:20485] [Feature #859] by Roman Shterenzon. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/open-uri.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e6ef460fce..d3a71288fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Sep 7 16:00:45 2016 Tanaka Akira + + * lib/open-uri.rb: Allow http to https redirection. + Note that https to http is still forbidden. + [ruby-core:20485] [Feature #859] by Roman Shterenzon. + Wed Sep 7 14:56:59 2016 Kazuki Tsujimoto * lib/csv.rb (CSV::{Row,Table}#{each,delete_if}): returns an enumerator diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 489b83ac98..2414f5101c 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -249,7 +249,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(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:https?|ftp)\z/i =~ uri2.scheme) end def OpenURI.open_http(buf, target, proxy, options) # :nodoc: -- cgit v1.2.3