github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't want Rack's Content-Type default header though

Browse Source
This commit is contained in:
Jeremy Kemper
2009-05-24 19:25:53 -07:00
parent b1d4fb71bf
commit 8097da93cc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
actionpack/lib/action_dispatch/http/response.rb
View File

@@ -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