From ccdcc971f6d0dbc6122d547be814c7e8826b7453 Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 7 Jan 2009 22:33:00 +0000 Subject: [PATCH] * lib/open-uri.rb (OpenURI.redirectable?): reverted https redirection. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/open-uri.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 27d686d750..57b059f924 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Jan 8 07:30:52 2009 Tanaka Akira + + * lib/open-uri.rb (OpenURI.redirectable?): reverted https redirection. + Thu Jan 8 00:31:58 2009 Tanaka Akira * lib/test/unit/assertions.rb (assert_no_match): don't count up as two diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 1584e35817..2a6c544fe6 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(?:https?|ftp)\z/i =~ uri1.scheme && /\A(?:https?|ftp)\z/i =~ uri2.scheme) + (/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:http|ftp)\z/i =~ uri2.scheme) end def OpenURI.open_http(buf, target, proxy, options) # :nodoc: