diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-03-18 17:32:53 -0700 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-03-18 17:32:53 -0700 |
| commit | 1dacc19702f88a18a57615d1a5eeab3d0f5f9007 (patch) | |
| tree | 1ba168d616d1a6fd4086919d59cb2266a1667dd7 /actionpack/lib/action_controller | |
| parent | edb5991a14e0dfb65d2b8802d61b44fc47004921 (diff) | |
| download | rails-1dacc19702f88a18a57615d1a5eeab3d0f5f9007.tar.gz rails-1dacc19702f88a18a57615d1a5eeab3d0f5f9007.tar.bz2 rails-1dacc19702f88a18a57615d1a5eeab3d0f5f9007.zip | |
Return a valid Rack response from bare ActionController::Metal
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index a148c19a31..30aa34d956 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -38,7 +38,8 @@ module ActionController delegate :session, :to => "@_request" def initialize(*) - @_headers = {} + @_headers = {"Content-Type" => "text/html"} + @_status = 200 super end @@ -70,6 +71,11 @@ module ActionController @_status = Rack::Utils.status_code(status) end + def response_body=(val) + body = val.respond_to?(:each) ? val : [val] + super body + end + # :api: private def dispatch(name, request) @_request = request |