diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-08 13:11:46 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-08 13:11:46 +0000 |
| commit | 720e110b51afda360cf3db8b4e0dadb1f710c4ed (patch) | |
| tree | 7cfc575691b4ce06d3a4419fa6342bdc77441bd2 | |
| parent | 3f8155ba7e3edf8bf49597e2ce1b6d7526a701f6 (diff) | |
| download | ruby-720e110b51afda360cf3db8b4e0dadb1f710c4ed.tar.gz ruby-720e110b51afda360cf3db8b4e0dadb1f710c4ed.tar.xz ruby-720e110b51afda360cf3db8b4e0dadb1f710c4ed.zip | |
* lib/open-uri.rb (OpenURI.open_http): rescue URI::InvalidURIError by
URI.parse for location URI.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/open-uri.rb | 7 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Feb 8 22:10:36 2008 Tanaka Akira <akr@fsij.org> + + * 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@ruby-lang.org> * ext/iconv/iconv.c (rb_str_derive): uses rb_str_subseq() for byte diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 2b6cd8fd6..64b78b121 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -330,7 +330,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 |