1 files changed, 59 insertions, 38 deletions

diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 4aee489912..d1e1f1fcf6 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -38,8 +38,6 @@ module ActionDispatch # :nodoc:
     # The HTTP status code.
     attr_reader :status
 
-    attr_writer :sending_file
-
     # Get headers for this response.
     attr_reader :header
 
@@ -48,20 +46,6 @@ module ActionDispatch # :nodoc:
     delegate :[], :[]=, :to => :@header
     delegate :each, :to => :@stream
 
-    # Sets the HTTP response's content MIME type. For example, in the controller
-    # you could write this:
-    #
-    #  response.content_type = "text/plain"
-    #
-    # If a character set has been defined for this response (see charset=) then
-    # the character set information will also be included in the content type
-    # information.
-    attr_reader   :content_type
-
-    # The charset of the response. HTML wants to know the encoding of the
-    # content you're giving them, so we need to send that along.
-    attr_reader :charset
-
     CONTENT_TYPE = "Content-Type".freeze
     SET_COOKIE   = "Set-Cookie".freeze
     LOCATION     = "Location".freeze
@@ -130,20 +114,11 @@ module ActionDispatch # :nodoc:
 
       self.body, self.status = body, status
 
-      @sending_file = false
       @blank        = false
       @cv           = new_cond
       @committed    = false
       @sending      = false
       @sent         = false
-      @content_type = nil
-      @charset      = self.class.default_charset
-
-      if content_type = self[CONTENT_TYPE]
-        type, charset = content_type.split(/;\s*charset=/)
-        @content_type = Mime::Type.lookup(type)
-        @charset = charset || self.class.default_charset
-      end
 
       prepare_cache_control!
 
@@ -199,7 +174,27 @@ module ActionDispatch # :nodoc:
 
     # Sets the HTTP content type.
     def content_type=(content_type)
-      @content_type = content_type.to_s
+      header_info = parse_content_type
+      set_content_type content_type.to_s, header_info.charset || self.class.default_charset
+    end
+
+    # Sets the HTTP response's content MIME type. For example, in the controller
+    # you could write this:
+    #
+    #  response.content_type = "text/plain"
+    #
+    # If a character set has been defined for this response (see charset=) then
+    # the character set information will also be included in the content type
+    # information.
+
+    def content_type
+      parse_content_type.mime_type
+    end
+
+    def sending_file=(v)
+      if true == v
+        self.charset = false
+      end
     end
 
     # Sets the HTTP character set. In case of nil parameter
@@ -208,7 +203,20 @@ module ActionDispatch # :nodoc:
     #   response.charset = 'utf-16' # => 'utf-16'
     #   response.charset = nil      # => 'utf-8'
     def charset=(charset)
-      @charset = charset.nil? ? self.class.default_charset : charset
+      header_info = parse_content_type
+      if false == charset
+        set_header CONTENT_TYPE, header_info.mime_type
+      else
+        content_type = header_info.mime_type
+        set_content_type content_type, charset || self.class.default_charset
+      end
+    end
+
+    # The charset of the response. HTML wants to know the encoding of the
+    # content you're giving them, so we need to send that along.
+    def charset
+      header_info = parse_content_type
+      header_info.charset || self.class.default_charset
     end
 
     # The response code of the request.
@@ -308,6 +316,26 @@ module ActionDispatch # :nodoc:
 
   private
 
+    ContentTypeHeader = Struct.new :mime_type, :charset
+    NullContentTypeHeader = ContentTypeHeader.new nil, nil
+
+    def parse_content_type
+      content_type = get_header CONTENT_TYPE
+      if content_type
+        type, charset = content_type.split(/;\s*charset=/)
+        type = nil if type.empty?
+        ContentTypeHeader.new(type, charset)
+      else
+        NullContentTypeHeader
+      end
+    end
+
+    def set_content_type(content_type, charset)
+      type = (content_type || '').dup
+      type << "; charset=#{charset}" if charset
+      set_header CONTENT_TYPE, type
+    end
+
     def before_committed
       return if committed?
       assign_default_content_type_and_charset!
@@ -330,18 +358,11 @@ module ActionDispatch # :nodoc:
     end
 
     def assign_default_content_type_and_charset!
-      return if get_header(CONTENT_TYPE).present?
-
-      @content_type ||= Mime::HTML
-
-      type = @content_type.to_s.dup
-      type << "; charset=#{charset}" if append_charset?
-
-      set_header CONTENT_TYPE, type
-    end
+      return if content_type
 
-    def append_charset?
-      !@sending_file && @charset != false
+      ct = parse_content_type
+      set_content_type(ct.mime_type || Mime::HTML.to_s,
+                       ct.charset || self.class.default_charset)
     end
 
     class RackBody