akr	2009-01-08 07:33:00 +0900 (Thu, 08 Jan 2009)

  New Revision: 21381

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21381

  Log:
    * lib/open-uri.rb (OpenURI.redirectable?): reverted https redirection.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/open-uri.rb
    trunk/ChangeLog
    trunk/lib/open-uri.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21380)
+++ ChangeLog	(revision 21381)
@@ -1,3 +1,7 @@
+Thu Jan  8 07:30:52 2009  Tanaka Akira  <akr@f...>
+
+	* lib/open-uri.rb (OpenURI.redirectable?): reverted https redirection.
+
 Thu Jan  8 00:31:58 2009  Tanaka Akira  <akr@f...>
 
 	* lib/test/unit/assertions.rb (assert_no_match): don't count up as two
Index: lib/open-uri.rb
===================================================================
--- lib/open-uri.rb	(revision 21380)
+++ lib/open-uri.rb	(revision 21381)
@@ -240,7 +240,7 @@
     # (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:
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21380)
+++ ruby_1_9_1/ChangeLog	(revision 21381)
@@ -1,3 +1,7 @@
+Thu Jan  8 07:30:52 2009  Tanaka Akira  <akr@f...>
+
+	* lib/open-uri.rb (OpenURI.redirectable?): reverted https redirection.
+
 Sun Jan  4 18:10:10 2009  Martin Duerst  <duerst@i...>
 
 	* enc/trans/gbk.trans, gbk-tbl.rb:
Index: ruby_1_9_1/lib/open-uri.rb
===================================================================
--- ruby_1_9_1/lib/open-uri.rb	(revision 21380)
+++ ruby_1_9_1/lib/open-uri.rb	(revision 21381)
@@ -240,7 +240,7 @@
     # (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:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/