From e4f07888ceca3c2ac11818a45cc3374537737e8e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 20 Feb 2005 17:18:59 +0000 Subject: Made caching work for WEBrick and lighttpd by appending .html for all URLs not already containing a dot git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@715 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/caching.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'actionpack/lib/action_controller/caching.rb') diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 996b5af08d..98dd9c9df6 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -90,11 +90,7 @@ module ActionController #:nodoc: private def page_cache_path(path) - if path[-1,1] == '/' - page_cache_directory + path + '/index' - else - page_cache_directory + path - end + page_cache_directory + path + ".html" end end @@ -115,13 +111,14 @@ module ActionController #:nodoc: # If no options are provided, the current +options+ for this action is used. Example: # cache_page "I'm the cached content", :controller => "lists", :action => "show" def cache_page(content = nil, options = {}) + logger.info "Cached page: #{options.inspect} || #{caching_allowed}" return unless perform_caching && caching_allowed self.class.cache_page(content || @response.body, url_for(options.merge({ :only_path => true }))) end private def caching_allowed - !@request.post? && (@request.parameters.reject { |k, v| %w( id action controller ).include?(k) }).empty? + !@request.post? end end -- cgit v1.2.3