1 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 129e0bbd3c..51562ec0fb 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -150,10 +150,10 @@ module ActionController
     # environment and response manually for performance reasons.
 
     attr_internal :response, :request
-    delegate :session, :headers, :to => "@_request"
+    delegate :session, :to => "@_request"
+    delegate :headers, :to => "@_response"
 
     def initialize
-      @_status = 200
       @_request = nil
       @_response = nil
       @_routes = nil
@@ -177,7 +177,7 @@ module ActionController
     end
 
     def content_type
-      headers["Content-Type"]
+      request.content_type
     end
 
     def location
@@ -194,12 +194,12 @@ module ActionController
     end
 
     def status
-      @_status
+      response.status
     end
     alias :response_code :status # :nodoc:
 
     def status=(status)
-      @_status = Rack::Utils.status_code(status)
+      response.status = Rack::Utils.status_code(status)
     end
 
     def response_body=(body)
@@ -210,7 +210,7 @@ module ActionController
 
     # Tests if render or redirect has already happened.
     def performed?
-      response_body || (response && response.committed?)
+      response_body || response.committed?
     end
 
     def dispatch(name, request, response) #:nodoc:
@@ -230,7 +230,7 @@ module ActionController
     end
 
     def to_a #:nodoc:
-      response ? response.to_a : [status, headers, response_body]
+      response.to_a
     end
 
     class_attribute :middleware_stack