akr	2008-02-08 22:11:46 +0900 (Fri, 08 Feb 2008)

  New Revision: 15406

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

  Log:
    * lib/open-uri.rb (OpenURI.open_http): rescue URI::InvalidURIError by
      URI.parse for location URI.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15406&r2=15405&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/open-uri.rb?r1=15406&r2=15405&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15405)
+++ ChangeLog	(revision 15406)
@@ -1,3 +1,8 @@
+Fri Feb  8 22:10:36 2008  Tanaka Akira  <akr@f...>
+
+	* lib/open-uri.rb (OpenURI.open_http): rescue URI::InvalidURIError by
+	  URI.parse for location URI.
+
 Fri Feb  8 19:22:13 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/iconv/iconv.c (rb_str_derive): uses rb_str_subseq() for byte
Index: lib/open-uri.rb
===================================================================
--- lib/open-uri.rb	(revision 15405)
+++ lib/open-uri.rb	(revision 15406)
@@ -330,7 +330,12 @@
          Net::HTTPFound, # 302
          Net::HTTPSeeOther, # 303
          Net::HTTPTemporaryRedirect # 307
-      throw :open_uri_redirect, URI.parse(resp['location'])
+      begin
+        loc_uri = URI.parse(resp['location'])
+      rescue URI::InvalidURIError
+        raise OpenURI::HTTPError.new(io.status.join(' ') + ' (Invalid Location URI)', io)
+      end
+      throw :open_uri_redirect, loc_uri
     else
       raise OpenURI::HTTPError.new(io.status.join(' '), io)
     end

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