summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/open-uri.rb2
2 files changed, 5 insertions, 1 deletions
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 <akr@fsij.org>
+
+ * lib/open-uri.rb (OpenURI.redirectable?): reverted https redirection.
+
Thu Jan 8 00:31:58 2009 Tanaka Akira <akr@fsij.org>
* 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: