diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-10 06:42:58 -0800 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-10 06:42:58 -0800 |
commit | b0a93d650fd6299c3e83e2c7f9531923b88028da (patch) | |
tree | bd7ad3e5beaf5eaba87451d8ae71b4e3b51573fc /railties/lib/rails/application.rb | |
parent | 3e776496d0a85942b65935e69ba63f1d1b5f18fc (diff) | |
parent | ec40f6cec082cfe76f24b27c19d15314f55be8af (diff) | |
download | rails-b0a93d650fd6299c3e83e2c7f9531923b88028da.tar.gz rails-b0a93d650fd6299c3e83e2c7f9531923b88028da.tar.bz2 rails-b0a93d650fd6299c3e83e2c7f9531923b88028da.zip |
Merge pull request #5367 from carlosantoniodasilva/middleware-api
Change api_only to http_only and add MiddlewareStackProxy docs
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r-- | railties/lib/rails/application.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 10fa63c303..3191fe68a7 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -239,7 +239,7 @@ module Rails middleware.use ::Rack::Lock unless config.allow_concurrency middleware.use ::Rack::Runtime - middleware.use ::Rack::MethodOverride unless config.middleware.api_only? + middleware.use ::Rack::MethodOverride unless config.middleware.http_only? middleware.use ::ActionDispatch::RequestId middleware.use ::Rails::Rack::Logger, config.log_tags # must come after Rack::MethodOverride to properly log overridden methods middleware.use ::ActionDispatch::ShowExceptions, config.exceptions_app || ActionDispatch::PublicExceptions.new(Rails.public_path) @@ -252,9 +252,9 @@ module Rails end middleware.use ::ActionDispatch::Callbacks - middleware.use ::ActionDispatch::Cookies unless config.middleware.api_only? + middleware.use ::ActionDispatch::Cookies unless config.middleware.http_only? - if !config.middleware.api_only? && config.session_store + if !config.middleware.http_only? && config.session_store if config.force_ssl && !config.session_options.key?(:secure) config.session_options[:secure] = true end @@ -267,7 +267,7 @@ module Rails middleware.use ::Rack::ConditionalGet middleware.use ::Rack::ETag, "no-cache" - if !config.middleware.api_only? && config.action_dispatch.best_standards_support + if !config.middleware.http_only? && config.action_dispatch.best_standards_support middleware.use ::ActionDispatch::BestStandardsSupport, config.action_dispatch.best_standards_support end end |