Ensure Cache-Control max-age is an integer

actionpack/lib/action_dispatch/http/response.rb

@@ -270,7 +270,7 @@ def set_conditional_cache_control!
           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

actionpack/test/controller/render_test.rb

@@ -54,7 +54,7 @@ def conditional_hello_with_public_header_and_expires_at
   end
   
   def conditional_hello_with_expires_in
-    expires_in 1.minute
+    expires_in 60.1.seconds
     render :action => 'hello_world'
   end