aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2018-02-24 18:20:21 -0500
committerGitHub <noreply@github.com>2018-02-24 18:20:21 -0500
commitefd3338b193da5ae5f0d42c4ad792d65e744428c (patch)
tree24218760676af6b8227bc5f266443f5799ada8ed /actionpack/test
parentc113bdc9d0c2cffd535ca97aff85c4bdc46b11f6 (diff)
parent697dd48b5e5787126a91ce10739f8af31d1ffd1d (diff)
downloadrails-efd3338b193da5ae5f0d42c4ad792d65e744428c.tar.gz
rails-efd3338b193da5ae5f0d42c4ad792d65e744428c.tar.bz2
rails-efd3338b193da5ae5f0d42c4ad792d65e744428c.zip
Merge pull request #31720 from grantbdev/update_default_hsts_max_age
Update default HSTS max-age value to 1 year
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/dispatch/ssl_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/ssl_test.rb b/actionpack/test/dispatch/ssl_test.rb
index 8ac9502af9..90f2ee46ea 100644
--- a/actionpack/test/dispatch/ssl_test.rb
+++ b/actionpack/test/dispatch/ssl_test.rb
@@ -98,8 +98,8 @@ class RedirectSSLTest < SSLTest
end
class StrictTransportSecurityTest < SSLTest
- EXPECTED = "max-age=15552000"
- EXPECTED_WITH_SUBDOMAINS = "max-age=15552000; includeSubDomains"
+ EXPECTED = "max-age=31536000"
+ EXPECTED_WITH_SUBDOMAINS = "max-age=31536000; includeSubDomains"
def assert_hsts(expected, url: "https://example.org", hsts: { subdomains: true }, headers: {})
self.app = build_app ssl_options: { hsts: hsts }, headers: headers