1 files changed, 9 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 70fd79bb8b..c5e7d4e357 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -14,7 +14,7 @@ module ActionController
     def render(*args) #:nodoc:
       raise ::AbstractController::DoubleRenderError if response_body
       super
-      self.content_type ||= Mime[formats.first].to_s
+      self.content_type ||= Mime[lookup_context.rendered_format].to_s
       response_body
     end
 
@@ -29,6 +29,10 @@ module ActionController
       self.response_body = nil
     end
 
+    def render_to_body(*)
+      super || " "
+    end
+
     private
 
     # Normalize arguments by catching blocks and setting them on :update.
@@ -44,6 +48,10 @@ module ActionController
         options[:text] = options[:text].to_text
       end
 
+      if options.delete(:nothing) || (options.key?(:text) && options[:text].nil?)
+        options[:text] = " "
+      end
+
       if options[:status]
         options[:status] = Rack::Utils.status_code(options[:status])
       end