move encoding check to response body

Author: kylekyle

lib/http/content_type.rb

@@ -20,13 +20,7 @@ def mime_type(str)
       # :nodoc:
       def charset(str)
         md = str.to_s.match CHARSET_RE
-        md &&= md[1].to_s.strip.gsub(/^"|"$/, "")
-        
-        begin 
-          md if Encoding.find(md)
-        rescue ArgumentError
-          nil
-        end
+        md && md[1].to_s.strip.gsub(/^"|"$/, "")
       end
     end
   end

lib/http/response/body.rb

@@ -35,11 +35,18 @@ def to_s
 
         fail StateError, "body is being streamed" unless @streaming.nil?
 
+        # see issue 312
+        begin
+          encoding = Encoding.find @encoding
+        rescue ArgumentError
+          encoding = Encoding::BINARY
+        end
+
         begin
           @streaming = false
-          @contents = "".force_encoding(@encoding)
+          @contents = "".force_encoding(encoding)
           while (chunk = @client.readpartial)
-            @contents << chunk.force_encoding(@encoding)
+            @contents << chunk.force_encoding(encoding)
           end
         rescue
           @contents = nil