actionpack 5.0.1.rc2 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78120e6032355f83a541aea2b9244d9af059a336
-  data.tar.gz: a7363d48f334f9ce6da98514d719349041c400df
+  metadata.gz: adec2805e3c4f12afd7b77c089a935256fe447a8
+  data.tar.gz: be1f90611b0af1bf8d080e774082fe5bd1e8089c
 SHA512:
-  metadata.gz: 516c9c4d7c5993d2b6dbd6ff382fae0aff3b1789065431988f00c2a556ab5855b74e054575b1ec3f696479085369098973b3f0354d07300ae9f482562531b9d2
-  data.tar.gz: 8c7bc165fea6532ec1caec33fa10f9995e5af2b5c665c935c7e230e5bc6af552448ce3f00eedee229ca1b7716e5856f688835c49c7dd7919915335587dcc7571
+  metadata.gz: d04129d8134b698dc545544d196cb480bca76a8b273f5d78dba8fc34d643f9d1c52a45989c7dbf0c48ca0c272ea74d4579e77278e8a49db49e3bf27bc4052280
+  data.tar.gz: 6b33c7eda6aba889bda90ceb08c9f085a96cce9a4c5e49dd257b6f09edb8aaed9e68336e881f85f4316056e3762dcc9061bb262ba313ce99203140b120e83a32

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 5.0.1 (December 21, 2016) ##
+
+*   Restored correct `charset` behavior on `send_data` and `send_file`: while
+    they should pass along any supplied value, they should not add a default.
+
+    Fixes #27344.
+
+    *Matthew Draper*
+
+
 ## Rails 5.0.1.rc2 (December 10, 2016) ##
 
 *   Move `cookies`, `flash`, and `session` methods back to

data/lib/action_controller/metal/data_streaming.rb

@@ -70,7 +70,6 @@ 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
@@ -113,6 +112,9 @@ module ActionController #:nodoc:
       def send_file_headers!(options)
         type_provided = options.has_key?(:type)
 
+        self.content_type = DEFAULT_SEND_FILE_TYPE
+        response.sending_file = true
+
         content_type = options.fetch(:type, DEFAULT_SEND_FILE_TYPE)
         raise ArgumentError, ":type option required" if content_type.nil?
 
@@ -137,8 +139,6 @@ module ActionController #:nodoc:
 
         headers['Content-Transfer-Encoding'] = 'binary'
 
-        response.sending_file = true
-
         # Fix a problem with IE 6.0 on opening downloaded files:
         # If Cache-Control: no-cache is set (which Rails does by default),
         # IE removes the file it just downloaded from its cache immediately

data/lib/action_dispatch/http/response.rb

@@ -227,7 +227,9 @@ module ActionDispatch # :nodoc:
       return unless content_type
       new_header_info = parse_content_type(content_type.to_s)
       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
+      charset = new_header_info.charset || prev_header_info.charset
+      charset ||= self.class.default_charset unless prev_header_info.mime_type
+      set_content_type new_header_info.mime_type, charset
     end
 
     # Sets the HTTP response's content MIME type. For example, in the controller

data/lib/action_pack/gem_version.rb

@@ -8,7 +8,7 @@ module ActionPack
     MAJOR = 5
     MINOR = 0
     TINY  = 1
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpack
 version: !ruby/object:Gem::Version
-  version: 5.0.1.rc2
+  version: 5.0.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1.rc2
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1.rc2
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -92,28 +92,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1.rc2
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1.rc2
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1.rc2
+        version: 5.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1.rc2
+        version: 5.0.1
 description: Web apps on Rails. Simple, battle-tested conventions for building and
   testing MVC web applications. Works with any Rack-compatible server.
 email: david@loudthinking.com
@@ -292,9 +292,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubyforge_project: 
@@ -303,3 +303,4 @@ signing_key:
 specification_version: 4
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).
 test_files: []
+has_rdoc: