Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed that caches_action breaks with file extensions (closes #6257) […

…Catfish]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5248 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit f9650a23f060c0d8678b2bda45e502f0bca487cc 1 parent 211ffd3
@dhh dhh authored
View
2  actionpack/lib/action_controller/caching.rb
@@ -210,7 +210,7 @@ def after(controller)
def set_content_type!(action_cache_path)
if extention = action_cache_path.extension
content_type = Mime::EXTENSION_LOOKUP[extention]
- action_cache_path.controller.content_type = content_type.to_s
+ action_cache_path.controller.response.content_type = content_type.to_s
end
end
View
7 actionpack/test/controller/action_caching_test.rb
@@ -121,6 +121,13 @@ def test_empty_path_is_normalized
assert_equal 'example.org/index', @path_class.path_for(@mock_controller)
end
+ def test_file_extensions
+ get :index, :id => 'kitten.jpg'
+ get :index, :id => 'kitten.jpg'
+
+ assert_response :success
+ end
+
private
def content_to_cache
Please sign in to comment.
Something went wrong with that request. Please try again.