* lib/open-uri.rb (OpenURI::Meta#meta_setup_encoding): use ASCII-8BIT

  for charset unspecified non-text data.


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

2 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 07d5c672e6..9b1388ce47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 28 23:37:12 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (OpenURI::Meta#meta_setup_encoding): use ASCII-8BIT
+	  for charset unspecified non-text data.
+
 Thu Feb 28 22:19:14 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* encoding.c (enc_capable): IMMEDIATE_P doesn't include Qnil and Qfalse.
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 01d8dd643f..be88b81079 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