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

2 files changed, 8 insertions, 1 deletions

diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index fa45b46e05..926535da03 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -210,7 +210,7 @@ module ActionController #:nodoc:
           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
           
diff --git a/actionpack/test/controller/action_caching_test.rb b/actionpack/test/controller/action_caching_test.rb
index 84b0cbd4a5..21c11ed417 100644
--- a/actionpack/test/controller/action_caching_test.rb
+++ b/actionpack/test/controller/action_caching_test.rb
@@ -121,6 +121,13 @@ class ActionCacheTest < Test::Unit::TestCase
     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