r22165@crimson: knu | 2009-02-09 11:55:30 +0900

 (OpenURI.open_http): rescue URI::InvalidURIError by URI.parse
 for location URI. (r15406)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 69232bf366..3132cd5593 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -327,7 +327,12 @@ module OpenURI
          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