diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-12-31 07:23:36 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-12-31 07:23:36 -0800 |
| commit | 5e5107430bccc0a536e0b264c951793d8fe62235 (patch) | |
| tree | 737db392cb78d5afa407d56cacd00e38551172cb /actionpack/lib/action_dispatch | |
| parent | 2b773e148b56e0cff3b07ef1902311688fb9fed8 (diff) | |
| parent | b8c2f3c7692867dfd444d60efb18570ad0fba236 (diff) | |
| download | rails-5e5107430bccc0a536e0b264c951793d8fe62235.tar.gz rails-5e5107430bccc0a536e0b264c951793d8fe62235.tar.bz2 rails-5e5107430bccc0a536e0b264c951793d8fe62235.zip | |
Merge pull request #8662 from senny/8661_should_not_append_charset_if_already_present
Charset should not be appended to image/* type
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index 0f808ac9cf..91cf4784db 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -260,14 +260,18 @@ module ActionDispatch # :nodoc: return if headers[CONTENT_TYPE].present? @content_type ||= Mime::HTML - @charset ||= self.class.default_charset + @charset ||= self.class.default_charset unless @charset == false type = @content_type.to_s.dup - type << "; charset=#{@charset}" unless @sending_file + type << "; charset=#{@charset}" if append_charset? headers[CONTENT_TYPE] = type end + def append_charset? + !@sending_file && @charset != false + end + def rack_response(status, header) assign_default_content_type_and_charset!(header) handle_conditional_get! |