diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 |
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 |