1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index a148c19a31..30aa34d956 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -38,7 +38,8 @@ module ActionController
     delegate :session, :to => "@_request"
 
     def initialize(*)
-      @_headers = {}
+      @_headers = {"Content-Type" => "text/html"}
+      @_status = 200
       super
     end
 
@@ -70,6 +71,11 @@ module ActionController
       @_status = Rack::Utils.status_code(status)
     end
 
+    def response_body=(val)
+      body = val.respond_to?(:each) ? val : [val]
+      super body
+    end
+
     # :api: private
     def dispatch(name, request)
       @_request = request