diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-12-31 16:52:27 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-12-31 16:52:27 -0200 |
| commit | 777c45e6a5a2cb89e1e1e892a32b0dbdebbfe680 (patch) | |
| tree | 9e84973c1bbd55ec44aeb8a56d5bdbc2459acc53 /actionpack/lib | |
| parent | ae08bef428827e8da4b00088b273de11b5190aed (diff) | |
| parent | 7ef7f1cc152a4b180dd455ffa859bf11d1daeda0 (diff) | |
| download | rails-777c45e6a5a2cb89e1e1e892a32b0dbdebbfe680.tar.gz rails-777c45e6a5a2cb89e1e1e892a32b0dbdebbfe680.tar.bz2 rails-777c45e6a5a2cb89e1e1e892a32b0dbdebbfe680.zip | |
Merge pull request #18275 from robin850/head-status
Correctly use the response's status code calling head
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/head.rb | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 6dd213b2f7..993f8e150d 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -173,6 +173,7 @@ module ActionController def status @_status end + alias :response_code :status # :nodoc: def status=(status) @_status = Rack::Utils.status_code(status) @@ -236,9 +237,5 @@ module ActionController lambda { |env| new.dispatch(name, klass.new(env)) } end end - - def _status_code #:nodoc: - @_status - end end end diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb index 57e60222cd..0d93e2f7aa 100644 --- a/actionpack/lib/action_controller/metal/head.rb +++ b/actionpack/lib/action_controller/metal/head.rb @@ -31,7 +31,7 @@ module ActionController self.response_body = "" - if include_content?(self._status_code) + if include_content?(self.response_code) self.content_type = content_type || (Mime[formats.first] if formats) self.response.charset = false if self.response else |