diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-28 14:38:33 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-28 14:38:33 +0000 |
| commit | 178f7f8d43f8d8242d7af38ad504d43250ed7e3f (patch) | |
| tree | eb5c349e9d0c5be14703e281cab0c84dbbf7ee37 /lib | |
| parent | 96a20b39c5e9bc0ab16821a19158e53a1d48bc90 (diff) | |
| download | ruby-178f7f8d43f8d8242d7af38ad504d43250ed7e3f.tar.gz ruby-178f7f8d43f8d8242d7af38ad504d43250ed7e3f.tar.xz ruby-178f7f8d43f8d8242d7af38ad504d43250ed7e3f.zip | |
* lib/open-uri.rb (OpenURI::Meta#meta_setup_encoding): use ASCII-8BIT
for charset unspecified non-text data.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/open-uri.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 01d8dd643..be88b8107 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -414,12 +414,14 @@ module OpenURI def meta_setup_encoding # :nodoc: charset = self.charset - return unless charset - begin - enc = Encoding.find(charset) - rescue ArgumentError - return + enc = nil + if charset + begin + enc = Encoding.find(charset) + rescue ArgumentError + end end + enc = Encoding::ASCII_8BIT unless enc if self.respond_to? :force_encoding self.force_encoding(enc) elsif self.respond_to? :string |