kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Don't set Content-Length on 304 responses

Browse source 
Commit 8aad8c claimed to do this, but it checks for the 304 status too early, before handle_conditional_get! has overridden it.

[#958 state:resolved]

Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
Jonathan del Strother 2008-09-02 17:33:52 +01:00 committed by Jeremy Kemper
parent 6f932b4790
commit 6cfb70023a
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_controller/response.rb
View file

@ -129,8 +129,8 @@ module ActionController # :nodoc:
def prepare!
assign_default_content_type_and_charset!
set_content_length!
handle_conditional_get!
set_content_length!
convert_content_type!
end

6
actionpack/test/controller/render_test.rb
View file

@ -1321,6 +1321,12 @@ class EtagRenderTest < Test::Unit::TestCase
assert @response.body.empty?
end
def test_render_against_etag_request_should_have_no_content_length_when_match
@request.if_none_match = etag_for("hello david")
get :render_hello_world_from_variable
assert !@response.headers.has_key?("Content-Length")
end
def test_render_against_etag_request_should_200_when_no_match
@request.if_none_match = etag_for("hello somewhere else")
get :render_hello_world_from_variable