From a960fc703245df735787a3fcc05eb66701e150ba Mon Sep 17 00:00:00 2001
From: Jon Moss <me@jonathanmoss.me>
Date: Mon, 29 Aug 2016 17:34:39 -0400
Subject: Allow `send_file` to declare a charset

Removed my patch in favor of @tenderlove's less invasive approach.

[Aaron Patterson & Jon Moss]
---
 actionpack/lib/action_controller/metal/data_streaming.rb | 1 +
 actionpack/lib/action_dispatch/http/response.rb          | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb
index b598dd4d77..6a1acb64f7 100644
--- a/actionpack/lib/action_controller/metal/data_streaming.rb
+++ b/actionpack/lib/action_controller/metal/data_streaming.rb
@@ -70,6 +70,7 @@ module ActionController #:nodoc:
         send_file_headers! options
 
         self.status = options[:status] || 200
+        self.content_type = options[:type] if options.key?(:type)
         self.content_type = options[:content_type] if options.key?(:content_type)
         response.send_file path
       end
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 9788431943..c8f0644ef5 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -224,8 +224,10 @@ module ActionDispatch # :nodoc:
 
     # Sets the HTTP content type.
     def content_type=(content_type)
-      header_info = parse_content_type
-      set_content_type content_type.to_s, header_info.charset || self.class.default_charset
+      return unless content_type
+      new_header_info = parse_content_type(content_type.to_s)
+      prev_header_info = parse_content_type(get_header(CONTENT_TYPE))
+      set_content_type new_header_info.mime_type, new_header_info.charset || prev_header_info.charset || self.class.default_charset
     end
 
     # Sets the HTTP response's content MIME type. For example, in the controller
@@ -403,8 +405,7 @@ module ActionDispatch # :nodoc:
     ContentTypeHeader = Struct.new :mime_type, :charset
     NullContentTypeHeader = ContentTypeHeader.new nil, nil
 
-    def parse_content_type
-      content_type = get_header CONTENT_TYPE
+    def parse_content_type(content_type = get_header(CONTENT_TYPE))
       if content_type
         type, charset = content_type.split(/;\s*charset=/)
         type = nil if type.empty?
-- 
cgit v1.2.3


From 92f8b99ff74cee43f56ff336838b3a776e763136 Mon Sep 17 00:00:00 2001
From: Jon Moss <me@jonathanmoss.me>
Date: Mon, 29 Aug 2016 17:57:40 -0400
Subject: Remove default argument, and extract internal convenience method

---
 actionpack/lib/action_dispatch/http/response.rb | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index c8f0644ef5..e8173e2a99 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -226,7 +226,7 @@ module ActionDispatch # :nodoc:
     def content_type=(content_type)
       return unless content_type
       new_header_info = parse_content_type(content_type.to_s)
-      prev_header_info = parse_content_type(get_header(CONTENT_TYPE))
+      prev_header_info = parsed_content_type_header
       set_content_type new_header_info.mime_type, new_header_info.charset || prev_header_info.charset || self.class.default_charset
     end
 
@@ -240,7 +240,7 @@ module ActionDispatch # :nodoc:
     # information.
 
     def content_type
-      parse_content_type.mime_type
+      parsed_content_type_header.mime_type
     end
 
     def sending_file=(v)
@@ -255,7 +255,7 @@ module ActionDispatch # :nodoc:
     #   response.charset = 'utf-16' # => 'utf-16'
     #   response.charset = nil      # => 'utf-8'
     def charset=(charset)
-      header_info = parse_content_type
+      header_info = parsed_content_type_header
       if false == charset
         set_header CONTENT_TYPE, header_info.mime_type
       else
@@ -267,7 +267,7 @@ module ActionDispatch # :nodoc:
     # The charset of the response. HTML wants to know the encoding of the
     # content you're giving them, so we need to send that along.
     def charset
-      header_info = parse_content_type
+      header_info = parsed_content_type_header
       header_info.charset || self.class.default_charset
     end
 
@@ -405,7 +405,7 @@ module ActionDispatch # :nodoc:
     ContentTypeHeader = Struct.new :mime_type, :charset
     NullContentTypeHeader = ContentTypeHeader.new nil, nil
 
-    def parse_content_type(content_type = get_header(CONTENT_TYPE))
+    def parse_content_type(content_type)
       if content_type
         type, charset = content_type.split(/;\s*charset=/)
         type = nil if type.empty?
@@ -415,6 +415,12 @@ module ActionDispatch # :nodoc:
       end
     end
 
+    # Small internal convenience method to get the parsed version of the current
+    # content type header.
+    def parsed_content_type_header
+      parse_content_type(get_header(CONTENT_TYPE))
+    end
+
     def set_content_type(content_type, charset)
       type = (content_type || "").dup
       type << "; charset=#{charset}" if charset
@@ -451,7 +457,7 @@ module ActionDispatch # :nodoc:
     def assign_default_content_type_and_charset!
       return if content_type
 
-      ct = parse_content_type
+      ct = parsed_content_type_header
       set_content_type(ct.mime_type || Mime[:html].to_s,
                        ct.charset || self.class.default_charset)
     end
-- 
cgit v1.2.3