From 6cfb70023a7b102debaa7f1505b173556a285ae7 Mon Sep 17 00:00:00 2001 From: Jonathan del Strother Date: Tue, 2 Sep 2008 17:33:52 +0100 Subject: Don't set Content-Length on 304 responses 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 Signed-off-by: Jeremy Kemper --- actionpack/lib/action_controller/response.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_controller/response.rb b/actionpack/lib/action_controller/response.rb index 5dac4128bb..54a99996ef 100644 --- a/actionpack/lib/action_controller/response.rb +++ b/actionpack/lib/action_controller/response.rb @@ -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 -- cgit v1.2.3