diff options
| author | Jonathan del Strother <jon.delStrother@bestbefore.tv> | 2008-09-02 17:33:52 +0100 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-09-02 22:57:40 +0200 |
| commit | 6cfb70023a7b102debaa7f1505b173556a285ae7 (patch) | |
| tree | e0ad6b193959f6f24ee50c5d6a2717ec25ef65ac /actionpack/lib/action_controller/response.rb | |
| parent | 6f932b4790371e548c0df9033da96b2cf8f51dcc (diff) | |
| download | rails-6cfb70023a7b102debaa7f1505b173556a285ae7.tar.gz rails-6cfb70023a7b102debaa7f1505b173556a285ae7.tar.bz2 rails-6cfb70023a7b102debaa7f1505b173556a285ae7.zip | |
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 <jon.delStrother@bestbefore.tv>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/lib/action_controller/response.rb')
| -rw-r--r-- | actionpack/lib/action_controller/response.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |