diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-01 15:45:43 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-01 15:45:43 -0300 |
| commit | 39e4e76d15233bb1cb0b778d920f54efe86bb4f0 (patch) | |
| tree | 7e9cab343139c79acc36715f4f24c579a207fbc6 /actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/adapter | |
| parent | 6b67df70ab1bc42d9a05571144cdf5614a7d4a6a (diff) | |
| parent | da636809daca9c338200811d3590e446f57c8e81 (diff) | |
| download | rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.tar.gz rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.tar.bz2 rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/adapter')
| -rw-r--r-- | actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/adapter/camping.rb | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/adapter/camping.rb b/actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/adapter/camping.rb deleted file mode 100644 index 63bc787f54..0000000000 --- a/actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/adapter/camping.rb +++ /dev/null @@ -1,22 +0,0 @@ -module Rack - module Adapter - class Camping - def initialize(app) - @app = app - end - - def call(env) - env["PATH_INFO"] ||= "" - env["SCRIPT_NAME"] ||= "" - controller = @app.run(env['rack.input'], env) - h = controller.headers - h.each_pair do |k,v| - if v.kind_of? URI - h[k] = v.to_s - end - end - [controller.status, controller.headers, [controller.body.to_s]] - end - end - end -end |