From 178f7f8d43f8d8242d7af38ad504d43250ed7e3f Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 28 Feb 2008 14:38:33 +0000
Subject: * 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
---
 lib/open-uri.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'lib')

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
-- 
cgit