diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-19 02:10:19 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-19 02:10:19 +0000 |
commit | 94fa0ed053a92b4dc48501d7dc7e7ebcec7e1ca6 (patch) | |
tree | 85194fe2927c771024336fa4ac5cb0cb9d642995 /actionpack/lib/action_controller | |
parent | bd0cd043744c0aca38273de82f8b77d0e62ac5f6 (diff) | |
download | rails-94fa0ed053a92b4dc48501d7dc7e7ebcec7e1ca6.tar.gz rails-94fa0ed053a92b4dc48501d7dc7e7ebcec7e1ca6.tar.bz2 rails-94fa0ed053a92b4dc48501d7dc7e7ebcec7e1ca6.zip |
Its ETag not Etag
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6168 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-x | actionpack/lib/action_controller/response.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/response.rb b/actionpack/lib/action_controller/response.rb index 3a901cf351..22dc502395 100755 --- a/actionpack/lib/action_controller/response.rb +++ b/actionpack/lib/action_controller/response.rb @@ -44,10 +44,10 @@ module ActionController private def handle_conditional_get! if body.is_a?(String) && headers['Status'][0..2] == '200' && !body.empty? - self.headers['Etag'] ||= %("#{Digest::MD5.hexdigest(body)}") + self.headers['ETag'] ||= %("#{Digest::MD5.hexdigest(body)}") self.headers['Cache-Control'] = 'private' if headers['Cache-Control'] == DEFAULT_HEADERS['Cache-Control'] - if request.headers['HTTP_IF_NONE_MATCH'] == headers['Etag'] + if request.headers['HTTP_IF_NONE_MATCH'] == headers['ETag'] self.headers['Status'] = '304 Not Modified' self.body = '' end |