@@ -1,5 +1,7 @@ *2.3.0 [Edge]* +* Fixed that send_file shouldn't set an etag #1578 [Hongli Lai] + * Allow users to opt out of the spoofing checks in Request#remote_ip. Useful for sites whose traffic regularly triggers false positives. [Darren Boyd] * Deprecated formatted_polymorphic_url. [Jeremy Kemper] actionpack/CHANGELOG @@ -115,7 +115,11 @@ module ActionController # :nodoc: end def etag=(etag) - headers['ETag'] = %("#{Digest::MD5.hexdigest(ActiveSupport::Cache.expand_cache_key(etag))}") + if etag.blank? + headers.delete('ETag') + else + headers['ETag'] = %("#{Digest::MD5.hexdigest(ActiveSupport::Cache.expand_cache_key(etag))}") + end end def redirect(url, status) actionpack/lib/action_controller/response.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 actionpack/test/controller/render_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 actionpack/test/controller/send_file_test.rb 7c090509994faa19fcbd534aa78324b70b659627 Hongli Lai (Phusion hongli@phusion.nl http://github.com/rails/rails/commit/9e2b4a10f7f091868b3c3701efb4c04048455706 9e2b4a10f7f091868b3c3701efb4c04048455706 2008-12-16T03:30:28-08:00 2008-12-15T12:36:33-08:00 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> b7bfb7a80b78a22e5ab562a7d26c3d01abc7631d David Heinemeier Hansson david@loudthinking.com