1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index a01114b730..b9db7a4508 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -41,7 +41,8 @@ module ActionDispatch # :nodoc:
     delegate :default_charset, :to => 'ActionController::Base'
 
     def initialize
-      super([], 200, DEFAULT_HEADERS)
+      super
+      @header = Rack::Utils::HeaderHash.new(DEFAULT_HEADERS)
     end
 
     # The response code of the request
@@ -161,7 +162,7 @@ module ActionDispatch # :nodoc:
     end
 
     def assign_default_content_type_and_charset!
-      if type = headers['Content-Type']
+      if type = headers['Content-Type'] || headers['type']
         unless type =~ /charset=/ || sending_file?
           headers['Content-Type'] = "#{type}; charset=#{default_charset}"
         end