diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-18 23:54:20 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-18 23:54:20 +0000 |
| commit | aad7fbde68684547959dcccc2102c978d5347a78 (patch) | |
| tree | 9d6c2ecc6d8b01ee3e606c3dad7497d8d5cfecbc /actionpack/lib/action_controller | |
| parent | 109d4ac95443421da93bbad1d02e949429362221 (diff) | |
| download | rails-aad7fbde68684547959dcccc2102c978d5347a78.tar.gz rails-aad7fbde68684547959dcccc2102c978d5347a78.tar.bz2 rails-aad7fbde68684547959dcccc2102c978d5347a78.zip | |
Added caching option to AssetTagHelper#stylesheet_link_tag and AssetTagHelper#javascript_include_tag [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6164 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index ecbe15bada..c012abc448 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -879,7 +879,7 @@ module ActionController #:nodoc: if text.is_a?(String) if response.headers['Status'][0..2] == '200' && !response.body.empty? - response.headers['Etag'] ||= %("#{Digest::MD5.hexdigest(text)}") + response.headers['Etag'] = %("#{Digest::MD5.hexdigest(text)}") if request.headers['HTTP_IF_NONE_MATCH'] == response.headers['Etag'] response.headers['Status'] = "304 Not Modified" |