Merge commit 'mainstream/master'

1 files changed, 21 insertions, 12 deletions

diff --git a/actionpack/lib/action_controller/response.rb b/actionpack/lib/action_controller/response.rb
index b440065482..559c38efd0 100644
--- a/actionpack/lib/action_controller/response.rb
+++ b/actionpack/lib/action_controller/response.rb
@@ -106,8 +106,14 @@ module ActionController # :nodoc:
       headers['Last-Modified'] = utc_time.httpdate
     end
 
-    def etag; headers['ETag'] end
-    def etag?; headers.include?('ETag') end
+    def etag
+      headers['ETag']
+    end
+    
+    def etag?
+      headers.include?('ETag')
+    end
+    
     def etag=(etag)
       headers['ETag'] = %("#{Digest::MD5.hexdigest(ActiveSupport::Cache.expand_cache_key(etag))}")
     end
@@ -135,16 +141,19 @@ module ActionController # :nodoc:
     end
 
     private
-      def handle_conditional_get!
-        if nonempty_ok_response?
-          self.etag ||= body
-          if request && request.etag_matches?(etag)
-            self.status = '304 Not Modified'
-            self.body = ''
-          end
-        end
-
-        set_conditional_cache_control! if etag? || last_modified?
+      def handle_conditional_get! 
+        if etag? || last_modified? 
+          set_conditional_cache_control! 
+        elsif nonempty_ok_response? 
+          self.etag = body 
+
+          if request && request.etag_matches?(etag) 
+            self.status = '304 Not Modified' 
+            self.body = '' 
+          end 
+
+          set_conditional_cache_control! 
+        end 
       end
 
       def nonempty_ok_response?