diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-10-10 02:10:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-10 02:10:20 -0300 |
| commit | 0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3 (patch) | |
| tree | 0d0363ee64c840cadf9e0e0d7e32de95633287ae /actionpack/lib/action_dispatch/middleware/ssl.rb | |
| parent | 034e4d38b508cbf2a8eaa9742df3e1948e482827 (diff) | |
| parent | de9542acd56f60d281465a59eac11e15ca8b3323 (diff) | |
| download | rails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.tar.gz rails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.tar.bz2 rails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.zip | |
Merge pull request #26746 from rails/deprecations
Remove all deprecations from Action Pack
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/ssl.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/ssl.rb | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/ssl.rb b/actionpack/lib/action_dispatch/middleware/ssl.rb index 992daab3aa..c9bd417aa2 100644 --- a/actionpack/lib/action_dispatch/middleware/ssl.rb +++ b/actionpack/lib/action_dispatch/middleware/ssl.rb @@ -45,35 +45,17 @@ module ActionDispatch HSTS_EXPIRES_IN = 15552000 def self.default_hsts_options - { expires: HSTS_EXPIRES_IN, subdomains: false, preload: false } + { expires: HSTS_EXPIRES_IN, subdomains: true, preload: false } end - def initialize(app, redirect: {}, hsts: {}, secure_cookies: true, **options) + def initialize(app, redirect: {}, hsts: {}, secure_cookies: true) @app = app - if options[:host] || options[:port] - ActiveSupport::Deprecation.warn <<-end_warning.strip_heredoc - The `:host` and `:port` options are moving within `:redirect`: - `config.ssl_options = { redirect: { host: …, port: … } }`. - end_warning - @redirect = options.slice(:host, :port) - else - @redirect = redirect - end + @redirect = redirect @exclude = @redirect && @redirect[:exclude] || proc { !@redirect } @secure_cookies = secure_cookies - if hsts != true && hsts != false && hsts[:subdomains].nil? - hsts[:subdomains] = false - - ActiveSupport::Deprecation.warn <<-end_warning.strip_heredoc - In Rails 5.1, The `:subdomains` option of HSTS config will be treated as true if - unspecified. Set `config.ssl_options = { hsts: { subdomains: false } }` to opt out - of this behavior. - end_warning - end - @hsts_header = build_hsts_header(normalize_hsts_options(hsts)) end |