yugui	2008-12-28 18:40:37 +0900 (Sun, 28 Dec 2008)

  New Revision: 21117

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

  Log:
    merges r21087 from trunk into ruby_1_9_1.
    * lib/open-uri.rb (OpenURI.redirectable?): permit https redirection.
      patch from Roman Shterenzon.  [ruby-core:20485]

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

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21116)
+++ ruby_1_9_1/ChangeLog	(revision 21117)
@@ -1,3 +1,8 @@
+Sat Dec 27 14:29:33 2008  Tanaka Akira  <akr@f...>
+
+	* 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@a...>
 
 	* eval.c (get_errinfo): return th->errinfo value
Index: ruby_1_9_1/lib/open-uri.rb
===================================================================
--- ruby_1_9_1/lib/open-uri.rb	(revision 21116)
+++ ruby_1_9_1/lib/open-uri.rb	(revision 21117)
@@ -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(?: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:

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