diff options
Diffstat (limited to 'actionpack/lib/action_controller/dispatch')
-rw-r--r-- | actionpack/lib/action_controller/dispatch/dispatcher.rb | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb index 74c72e1a8b..1a923724a1 100644 --- a/actionpack/lib/action_controller/dispatch/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb @@ -23,11 +23,6 @@ module ActionController end end - # DEPRECATE: Remove CGI support - def dispatch(cgi = nil, session_options = CgiRequest::DEFAULT_SESSION_OPTIONS, output = $stdout) - new(output).dispatch_cgi(cgi, session_options) - end - # Add a preparation callback. Preparation callbacks are run before every # request in development mode, and before the first request in production # mode. @@ -43,13 +38,7 @@ module ActionController end def run_prepare_callbacks - if defined?(Rails) && Rails.logger - logger = Rails.logger - else - logger = Logger.new($stderr) - end - - new(logger).send :run_callbacks, :prepare_dispatch + new.send :run_callbacks, :prepare_dispatch end def reload_application @@ -76,9 +65,7 @@ module ActionController include ActiveSupport::Callbacks define_callbacks :prepare_dispatch, :before_dispatch, :after_dispatch - # DEPRECATE: Remove arguments, since they are only used by CGI - def initialize(output = $stdout, request = nil, response = nil) - @output = output + def initialize @app = @@middleware.build(lambda { |env| self.dup._call(env) }) end @@ -97,11 +84,6 @@ module ActionController end end - # DEPRECATE: Remove CGI support - def dispatch_cgi(cgi, session_options) - CGIHandler.dispatch_cgi(self, cgi, @output) - end - def call(env) @app.call(env) end |