3 files changed, 11 insertions, 9 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index de00ffb0f9..6c0a072b73 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -24,9 +24,9 @@ module AbstractController
       options = _normalize_render(*args, &block)
       self.response_body = render_to_body(options)
       if options[:html]
-        _set_content_type Mime::HTML.to_s
+        _set_html_content_type
       else
-        _set_content_type _get_content_type(rendered_format)
+        _set_rendered_content_type rendered_format
       end
       self.response_body
     end
@@ -106,10 +106,10 @@ module AbstractController
     def _process_format(format)
     end
 
-    def _get_content_type(rendered_format) # :nodoc:
+    def _set_html_content_type # :nodoc:
     end
 
-    def _set_content_type(type) # :nodoc:
+    def _set_rendered_content_type(format) # :nodoc:
     end
 
     # Normalize args and options.
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index e62da0fa70..88a4818c16 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -191,7 +191,7 @@ module ActionController #:nodoc:
 
       if format = collector.negotiate_format(request)
         _process_format(format)
-        _set_content_type _get_content_type format
+        _set_rendered_content_type format
         response = collector.response
         response ? response.call : render({})
       else
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 363d45c722..4214399b6f 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -56,12 +56,14 @@ module ActionController
       nil
     end
 
-    def _get_content_type(rendered_format)
-      self.content_type || rendered_format.to_s
+    def _set_html_content_type
+      self.content_type = Mime::HTML.to_s
     end
 
-    def _set_content_type(format)
-      self.content_type = format
+    def _set_rendered_content_type(format)
+      unless response.content_type
+        self.content_type = format.to_s
+      end
     end
 
     # Normalize arguments by catching blocks and setting them on :update.