diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-23 08:43:01 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-23 08:43:01 +0000 |
| commit | d1725929852ab9da48f7ff7c4fa7f401ac55c331 (patch) | |
| tree | c7ae66a7fd50ec9765285a226ff972bf96162625 /actionpack/lib | |
| parent | 023c4d68cc298f3a4e66fe5f17ca7e99547768b6 (diff) | |
| download | rails-d1725929852ab9da48f7ff7c4fa7f401ac55c331.tar.gz rails-d1725929852ab9da48f7ff7c4fa7f401ac55c331.tar.bz2 rails-d1725929852ab9da48f7ff7c4fa7f401ac55c331.zip | |
Added test for template to layout variable transfer
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1904 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 849b834cd1..bee72d90f2 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -724,7 +724,7 @@ module ActionController #:nodoc: # # This method will overwrite an existing Cache-Control header. # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more possibilities. - def expires_in(seconds, options = {}) + def expires_in(seconds, options = {}) #:doc: cache_options = { 'max-age' => seconds, 'private' => true }.symbolize_keys.merge!(options.symbolize_keys) cache_options.delete_if { |k,v| v.nil? or v == false } cache_control = cache_options.map{ |k,v| v == true ? k.to_s : "#{k.to_s}=#{v.to_s}"} @@ -733,7 +733,7 @@ module ActionController #:nodoc: # Sets a HTTP 1.1 Cache-Control header of "no-cache" so no caching should occur by the browser or # intermediate caches (like caching proxy servers). - def expires_now + def expires_now #:doc: @response.headers["Cache-Control"] = "no-cache" end |