Permalink
Browse files

Remove remaining http_only? calls.

  • Loading branch information...
1 parent 6db930c commit e1824c5991f0e694cf041c3aacd43a53ce97b0dd @josevalim josevalim committed Mar 14, 2012
Showing with 4 additions and 14 deletions.
  1. +4 −4 railties/lib/rails/application.rb
  2. +0 −10 railties/lib/rails/configuration.rb
@@ -239,7 +239,7 @@ def default_middleware_stack
middleware.use ::Rack::Lock unless config.allow_concurrency
middleware.use ::Rack::Runtime
- middleware.use ::Rack::MethodOverride unless config.middleware.http_only?
+ middleware.use ::Rack::MethodOverride
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 @@ def default_middleware_stack
end
middleware.use ::ActionDispatch::Callbacks
- middleware.use ::ActionDispatch::Cookies unless config.middleware.http_only?
+ middleware.use ::ActionDispatch::Cookies
- if !config.middleware.http_only? && config.session_store
+ if config.session_store
if config.force_ssl && !config.session_options.key?(:secure)
config.session_options[:secure] = true
end
@@ -267,7 +267,7 @@ def default_middleware_stack
middleware.use ::Rack::ConditionalGet
middleware.use ::Rack::ETag, "no-cache"
- if !config.middleware.http_only? && config.action_dispatch.best_standards_support
+ if config.action_dispatch.best_standards_support
middleware.use ::ActionDispatch::BestStandardsSupport, config.action_dispatch.best_standards_support
end
end
@@ -33,16 +33,6 @@ module Configuration
#
# config.middleware.delete ActionDispatch::BestStandardsSupport
#
- # In addition to these methods to handle the stack, if your application is
- # going to be used as an API endpoint only, the middleware stack can be
- # configured like this:
- #
- # config.middleware.http_only!
- #
- # By doing this, Rails will create a smaller middleware stack, by not adding
- # some middlewares that are usually useful for browser access only, such as
- # Cookies, Session and Flash, BestStandardsSupport, and MethodOverride. You
- # can always add any of them later manually if you want.
class MiddlewareStackProxy
def initialize
@operations = []

0 comments on commit e1824c5

Please sign in to comment.