diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-17 10:25:26 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-17 10:25:26 -0700 |
| commit | adadd865a2688f31146c877fbeea1269a15d41f4 (patch) | |
| tree | 280c1871410363b6bd16b5efe6af12373b615180 /guides/source | |
| parent | 6ce54d4ba8c220a84e55e7dd798d364c3f48d9f7 (diff) | |
| parent | da5a47e7b9cd438c68276ad0886f9bb1260867b0 (diff) | |
| download | rails-adadd865a2688f31146c877fbeea1269a15d41f4.tar.gz rails-adadd865a2688f31146c877fbeea1269a15d41f4.tar.bz2 rails-adadd865a2688f31146c877fbeea1269a15d41f4.zip | |
Merge pull request #5488 from rafaelfranca/ad-ssl
Remove Rack::SSL in favour of ActionDispatch::SSL
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/configuring.textile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/configuring.textile b/guides/source/configuring.textile index cfad642e0d..cf0d8f1a43 100644 --- a/guides/source/configuring.textile +++ b/guides/source/configuring.textile @@ -88,7 +88,7 @@ NOTE. The +config.asset_path+ configuration is ignored if the asset pipeline is * +config.filter_parameters+ used for filtering out the parameters that you don't want shown in the logs, such as passwords or credit card numbers. -* +config.force_ssl+ forces all requests to be under HTTPS protocol by using +Rack::SSL+ middleware. +* +config.force_ssl+ forces all requests to be under HTTPS protocol by using +ActionDispatch::SSL+ middleware. * +config.log_level+ defines the verbosity of the Rails logger. This option defaults to +:debug+ for all modes except production, where it defaults to +:info+. @@ -197,7 +197,7 @@ h4. Configuring Middleware Every Rails application comes with a standard set of middleware which it uses in this order in the development environment: -* +Rack::SSL+ forces every request to be under HTTPS protocol. Will be available if +config.force_ssl+ is set to +true+. Options passed to this can be configured by using +config.ssl_options+. +* +ActionDispatch::SSL+ forces every request to be under HTTPS protocol. Will be available if +config.force_ssl+ is set to +true+. Options passed to this can be configured by using +config.ssl_options+. * +ActionDispatch::Static+ is used to serve static assets. Disabled if +config.serve_static_assets+ is +true+. * +Rack::Lock+ wraps the app in mutex so it can only be called by a single thread at a time. Only enabled if +config.action_controller.allow_concurrency+ is set to +false+, which it is by default. * +ActiveSupport::Cache::Strategy::LocalCache+ serves as a basic memory backed cache. This cache is not thread safe and is intended only for serving as a temporary memory cache for a single thread. |