summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-27 05:30:58 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-27 05:30:58 +0000
commit8e727789838b5e5b6c9748a4689acd01fb79bf52 (patch)
treec725421c03fbc6897c67166248342e853b2e13a9
parentd66d2beb7b436c0a5d33f0d0fe5dcc2a804689d4 (diff)
downloadruby-8e727789838b5e5b6c9748a4689acd01fb79bf52.tar.gz
ruby-8e727789838b5e5b6c9748a4689acd01fb79bf52.tar.xz
ruby-8e727789838b5e5b6c9748a4689acd01fb79bf52.zip
* 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/trunk@21087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/open-uri.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a38c67993..40e3cc017 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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: