Changeset 6166

Timestamp:

02/19/07 01:33:35 (2 years ago)

Author:

david

Message:

Dont ask for no caching if we have a etag to base that decision on

Files:

• trunk/actionpack/lib/action_controller/response.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/response.rb

@@ -46 +46 @@
-        if body.is_a?(String) && headers['Status'][0..2] == '200' && !body.empty?
-          self.headers['Etag'] ||= %("#{Digest::MD5.hexdigest(body)}")
+          headers.delete('Cache-Control') if headers['Cache-Control'] == DEFAULT_HEADERS['Cache-Control']
-
-          if request.headers['HTTP_IF_NONE_MATCH'] == headers['Etag']