diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-02 18:50:26 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-02 18:50:26 -0700 |
| commit | 3c731a4ad62430100ba0b65bc966aa6dc6280c5f (patch) | |
| tree | 61063da65fd36a13eb5aa2b56eb5597e2f73bb30 /actionpack/lib/action_controller | |
| parent | 9abf589051006b62a2c7f8cf614eff629a083fd5 (diff) | |
| parent | c62abed8ca480216b3b6386c95935bfc24683216 (diff) | |
| download | rails-3c731a4ad62430100ba0b65bc966aa6dc6280c5f.tar.gz rails-3c731a4ad62430100ba0b65bc966aa6dc6280c5f.tar.bz2 rails-3c731a4ad62430100ba0b65bc966aa6dc6280c5f.zip | |
Merge pull request #7231 from armanddp/no_content
Remove single character body in head(:no_content) response
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/head.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb index 2fcd933d32..747e1273be 100644 --- a/actionpack/lib/action_controller/metal/head.rb +++ b/actionpack/lib/action_controller/metal/head.rb @@ -29,19 +29,19 @@ module ActionController self.status = status self.location = url_for(location) if location - if include_content_headers?(self.status) + if include_content?(self.status) self.content_type = content_type || (Mime[formats.first] if formats) + self.response_body = " " else headers.delete('Content-Type') headers.delete('Content-Length') + self.response_body = "" end - - self.response_body = " " end private # :nodoc: - def include_content_headers?(status) + def include_content?(status) case status when 100..199 false |