From 4fd84aae90e940b1a33429c4c5f9872fec777b80 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 18 Feb 2007 00:47:18 +0000 Subject: Etagging ignores appended and block responses. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6160 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/base.rb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'actionpack/lib/action_controller/base.rb') diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index e870dc3045..524d11de50 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -7,7 +7,7 @@ require 'action_controller/url_rewriter' require 'action_controller/status_codes' require 'drb' require 'set' -require 'md5' +require 'digest/md5' module ActionController #:nodoc: class ActionControllerError < StandardError #:nodoc: @@ -876,17 +876,19 @@ module ActionController #:nodoc: response.body << text else response.body = text - end - if response.headers['Status'] == "200 OK" && response.body.size > 0 - response.headers['Etag'] = "\"#{MD5.new(text).to_s}\"" - - if request.headers['HTTP_IF_NONE_MATCH'] == response.headers['Etag'] - response.headers['Status'] = "304 Not Modified" - response.body = '' + if text.is_a?(String) + if response.headers['Status'][0..2] == '200' && !response.body.empty? + response.headers['Etag'] = %("#{Digest::MD5.hexdigest(text)}") + + if request.headers['HTTP_IF_NONE_MATCH'] == response.headers['Etag'] + response.headers['Status'] = "304 Not Modified" + response.body = '' + end + end end end - + response.body end -- cgit v1.2.3