aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-02 01:48:56 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-02 01:48:56 +0000
commit3574ab30596ad3313607927505aed115b740fc87 (patch)
tree02f116b9ab80743ec1a961853b89607e6c57f438
parentf62b8af6883188bf340e27b2789b34a2fe0730b9 (diff)
downloadrails-3574ab30596ad3313607927505aed115b740fc87.tar.gz
rails-3574ab30596ad3313607927505aed115b740fc87.tar.bz2
rails-3574ab30596ad3313607927505aed115b740fc87.zip
Added that page caching will only happen if the response code is less than 400 (closes #4033) [g.bucher@teti.ch]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3738 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/caching.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index d198eaf05e..ca176ac92c 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added that page caching will only happen if the response code is less than 400 #4033 [g.bucher@teti.ch]
+
* Add ActionController::IntegrationTest to allow high-level testing of the way the controllers and routes all work together [Jamis Buck]
* Added support to AssetTagHelper#javascript_include_tag for having :defaults appear anywhere in the list, so you can now make one call ala javascript_include_tag(:defaults, "my_scripts") or javascript_include_tag("my_scripts", :defaults) depending on how you want the load order #3506 [Bob Silva]
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index e6849596db..a2259de46b 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -134,7 +134,7 @@ module ActionController #:nodoc:
private
def caching_allowed
- !@request.post?
+ !@request.post? && @response.headers['Status'] && @response.headers['Status'].to_i < 400
end
end