diff options
| author | Prem Sichanugrist <s@sikachu.com> | 2011-03-27 23:55:46 +0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-03-27 13:27:23 -0700 |
| commit | 2c0c4d754e34b13379dfc53121a970c25fab5dae (patch) | |
| tree | a911462aeb8f1bd2e8df9d255708d074cfdf37ce /railties/lib/rails/application/configuration.rb | |
| parent | b2d94322e6f2c2324154465147938ca8b16c610d (diff) | |
| download | rails-2c0c4d754e34b13379dfc53121a970c25fab5dae.tar.gz rails-2c0c4d754e34b13379dfc53121a970c25fab5dae.tar.bz2 rails-2c0c4d754e34b13379dfc53121a970c25fab5dae.zip | |
Add `config.force_ssl` configuration which will load `Rack::SSL` middleware if set to true
This will allow user to be able to force all requests to be under HTTPS protocol.
This commit was a request from DHH. Special thanks to Josh Peek as well for making `Rack::SSL`.
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index c74bcbedf2..23b0e765ae 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -9,7 +9,7 @@ module Rails :filter_parameters, :helpers_paths, :logger, :preload_frameworks, :reload_plugins, :secret_token, :serve_static_assets, :session_options, - :time_zone, :whiny_nils + :time_zone, :whiny_nils, :force_ssl attr_writer :log_level @@ -22,6 +22,7 @@ module Rails @helpers_paths = [] @dependency_loading = true @serve_static_assets = true + @force_ssl = false @session_store = :cookie_store @session_options = {} @time_zone = "UTC" |