Do not output an ETag header if response body is blank or when sending files with send_file(... :xsendfile => true) [#1578 state:committed]

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>

2 files changed, 10 insertions, 0 deletions

diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 87733c2d33..a6721fd903 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -208,6 +208,10 @@ class TestController < ActionController::Base
   def greeting
     # let's just rely on the template
   end
+  
+  def blank_response
+    render :text => ' '
+  end
 
   def layout_test
     render :action => "hello_world"
@@ -1380,6 +1384,11 @@ class EtagRenderTest < ActionController::TestCase
     @request.host = "www.nextangle.com"
     @expected_bang_etag = etag_for(expand_key([:foo, 123]))
   end
+  
+  def test_render_blank_body_shouldnt_set_etag
+    get :blank_response
+    assert !@response.etag?
+  end
 
   def test_render_200_should_set_etag
     get :render_hello_world_from_variable
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index c003abf094..ffbaa457f8 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -69,6 +69,7 @@ class SendFileTest < Test::Unit::TestCase
 
     assert_equal @controller.file_path, response.headers['X-Sendfile']
     assert response.body.blank?
+    assert !response.etag?
   end
 
   def test_data