aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2013-01-04 16:14:24 +0000
committerAndrew White <andyw@pixeltrix.co.uk>2013-01-04 16:20:23 +0000
commitadd4375a603850518c93edc2b4d0334a80b5e73d (patch)
tree831e5299f194e25c0d98bed4b436b60c74634e16 /actionpack/lib/action_dispatch
parente752cb49f690bfbc5a8856af5afdedfce2de33bb (diff)
downloadrails-add4375a603850518c93edc2b4d0334a80b5e73d.tar.gz
rails-add4375a603850518c93edc2b4d0334a80b5e73d.tar.bz2
rails-add4375a603850518c93edc2b4d0334a80b5e73d.zip
Allow use of durations for ActionDispatch::SSL configuration
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/middleware/ssl.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/ssl.rb b/actionpack/lib/action_dispatch/middleware/ssl.rb
index 9098f4e170..9e03cbf2b7 100644
--- a/actionpack/lib/action_dispatch/middleware/ssl.rb
+++ b/actionpack/lib/action_dispatch/middleware/ssl.rb
@@ -45,7 +45,7 @@ module ActionDispatch
# http://tools.ietf.org/html/draft-hodges-strict-transport-sec-02
def hsts_headers
if @hsts
- value = "max-age=#{@hsts[:expires]}"
+ value = "max-age=#{@hsts[:expires].to_i}"
value += "; includeSubDomains" if @hsts[:subdomains]
{ 'Strict-Transport-Security' => value }
else