diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-02 03:23:00 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-02 03:23:00 -0800 |
| commit | de40bc033a64c7074e01a8e8c585225f4cdaf81e (patch) | |
| tree | 556c722fc4df356581315bfaf00208d091aaae63 | |
| parent | ad26f066fe94bad4219f235a0d65190e4d8d15c8 (diff) | |
| download | rails-de40bc033a64c7074e01a8e8c585225f4cdaf81e.tar.gz rails-de40bc033a64c7074e01a8e8c585225f4cdaf81e.tar.bz2 rails-de40bc033a64c7074e01a8e8c585225f4cdaf81e.zip | |
Ensure Cache-Control max-age is an integer
| -rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index 32f9a0031d..4f35a00247 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -270,7 +270,7 @@ module ActionDispatch # :nodoc: max_age = control[:max_age] options = [] - options << "max-age=#{max_age}" if max_age + options << "max-age=#{max_age.to_i}" if max_age options << (control[:public] ? "public" : "private") options << "must-revalidate" if control[:must_revalidate] options.concat(extras) if extras diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index b32325fa20..cffa970011 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -54,7 +54,7 @@ class TestController < ActionController::Base end def conditional_hello_with_expires_in - expires_in 1.minute + expires_in 60.1.seconds render :action => 'hello_world' end |